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

Comparing microscheme/scheme.c (file contents):
Revision 1.42 by root, Mon Nov 30 06:19:18 2015 UTC vs.
Revision 1.69 by root, Mon Dec 7 22:12:53 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 PAGE_SIZE 4096 /* does not work on sparc/alpha */ 21#define _POSIX_C_SOURCE 200201
22#include "malloc.c" 22#define _XOPEN_SOURCE 600
23#define _GNU_SOURCE 1 /* for malloc mremap */
23 24
24#define SCHEME_SOURCE 25#define SCHEME_SOURCE
25#include "scheme-private.h" 26#include "scheme-private.h"
26#ifndef WIN32 27#ifndef WIN32
27# include <unistd.h> 28# include <unistd.h>
28#endif 29#endif
29#if USE_MATH 30#if USE_MATH
30# include <math.h> 31# include <math.h>
31#endif 32#endif
32 33
34#define ECB_NO_THREADS 1
33#include "ecb.h" 35#include "ecb.h"
34 36
35#include <sys/types.h> 37#include <sys/types.h>
36#include <sys/stat.h> 38#include <sys/stat.h>
37#include <fcntl.h> 39#include <fcntl.h>
… …
45#include <string.h> 47#include <string.h>
46 48
47#include <limits.h> 49#include <limits.h>
48#include <inttypes.h> 50#include <inttypes.h>
49#include <float.h> 51#include <float.h>
50//#include <ctype.h> 52
53#if !USE_SYSTEM_MALLOC
54# define PAGE_SIZE 4096 /* does not work on sparc/alpha */
55# include "malloc.c"
56# define malloc(n) tiny_malloc (n)
57# define realloc(p,n) tiny_realloc (p, n)
58# define free(p) tiny_free (p)
59#endif
51 60
52#if '1' != '0' + 1 \ 61#if '1' != '0' + 1 \
53 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \ 62 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
54 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \ 63 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
55 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \ 64 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
… …
77 86
78#define BACKQUOTE '`' 87#define BACKQUOTE '`'
79#define WHITESPACE " \t\r\n\v\f" 88#define WHITESPACE " \t\r\n\v\f"
80#define DELIMITERS "()\";" WHITESPACE 89#define DELIMITERS "()\";" WHITESPACE
81 90
82#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 91#define NIL POINTER (&SCHEME_V->xNIL)
83#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 92#define S_T POINTER (&SCHEME_V->xT)
84#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 93#define S_F POINTER (&SCHEME_V->xF)
85#define S_SINK (&SCHEME_V->xsink) 94#define S_SINK POINTER (&SCHEME_V->xsink)
86#define S_EOF (&SCHEME_V->xEOF_OBJ) 95#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
87 96
88#if !USE_MULTIPLICITY 97#if !USE_MULTIPLICITY
89static scheme sc; 98static scheme sc;
90#endif 99#endif
91 100
92static void 101ecb_cold static void
93xbase (char *s, long n, int base) 102xbase (char *s, long n, int base)
94{ 103{
95 if (n < 0) 104 if (n < 0)
96 { 105 {
97 *s++ = '-'; 106 *s++ = '-';
… …
99 } 108 }
100 109
101 char *p = s; 110 char *p = s;
102 111
103 do { 112 do {
104 *p++ = '0' + n % base; 113 *p++ = "0123456789abcdef"[n % base];
105 n /= base; 114 n /= base;
106 } while (n); 115 } while (n);
107 116
108 *p-- = 0; 117 *p-- = 0;
109 118
… …
112 char x = *s; *s = *p; *p = x; 121 char x = *s; *s = *p; *p = x;
113 --p; ++s; 122 --p; ++s;
114 } 123 }
115} 124}
116 125
117static void 126ecb_cold static void
118xnum (char *s, long n) 127xnum (char *s, long n)
119{ 128{
120 xbase (s, n, 10); 129 xbase (s, n, 10);
121} 130}
122 131
123static void 132ecb_cold static void
124xwrstr (const char *s) 133putnum (SCHEME_P_ long n)
125{
126 write (1, s, strlen (s));
127}
128
129static void
130xwrnum (long n)
131{ 134{
132 char buf[64]; 135 char buf[64];
133 136
134 xnum (buf, n); 137 xnum (buf, n);
135 xwrstr (buf); 138 putstr (SCHEME_A_ buf);
136} 139}
140
141#if USE_CHAR_CLASSIFIERS
142#include <ctype.h>
143#else
137 144
138static char 145static char
139xtoupper (char c) 146xtoupper (char c)
140{ 147{
141 if (c >= 'a' && c <= 'z') 148 if (c >= 'a' && c <= 'z')
… …
161 168
162#define toupper(c) xtoupper (c) 169#define toupper(c) xtoupper (c)
163#define tolower(c) xtolower (c) 170#define tolower(c) xtolower (c)
164#define isdigit(c) xisdigit (c) 171#define isdigit(c) xisdigit (c)
165 172
173#endif
174
166#if USE_IGNORECASE 175#if USE_IGNORECASE
167static const char * 176ecb_cold static const char *
168xstrlwr (char *s) 177xstrlwr (char *s)
169{ 178{
170 const char *p = s; 179 const char *p = s;
171 180
172 while (*s) 181 while (*s)
… …
185# define stricmp(a,b) strcmp (a, b) 194# define stricmp(a,b) strcmp (a, b)
186# define strlwr(s) (s) 195# define strlwr(s) (s)
187#endif 196#endif
188 197
189#ifndef prompt 198#ifndef prompt
190# define prompt "ts> " 199# define prompt "ms> "
191#endif 200#endif
192 201
193#ifndef InitFile 202#ifndef InitFile
194# define InitFile "init.scm" 203# define InitFile "init.scm"
195#endif 204#endif
196 205
197#ifndef FIRST_CELLSEGS
198# define FIRST_CELLSEGS 3
199#endif
200
201enum scheme_types 206enum scheme_types
202{ 207{
203 T_INTEGER, 208 T_INTEGER,
209 T_CHARACTER,
204 T_REAL, 210 T_REAL,
205 T_STRING, 211 T_STRING,
206 T_SYMBOL, 212 T_SYMBOL,
207 T_PROC, 213 T_PROC,
208 T_PAIR, /* also used for free cells */ 214 T_PAIR, /* also used for free cells */
209 T_CLOSURE, 215 T_CLOSURE,
216 T_BYTECODE, // temp
217 T_MACRO,
210 T_CONTINUATION, 218 T_CONTINUATION,
211 T_FOREIGN, 219 T_FOREIGN,
212 T_CHARACTER,
213 T_PORT, 220 T_PORT,
214 T_VECTOR, 221 T_VECTOR,
215 T_MACRO,
216 T_PROMISE, 222 T_PROMISE,
217 T_ENVIRONMENT, 223 T_ENVIRONMENT,
218 /* one more... */ 224 T_SPECIAL, // #t, #f, '(), eof-object
225
219 T_NUM_SYSTEM_TYPES 226 T_NUM_SYSTEM_TYPES
220}; 227};
221 228
222#define T_MASKTYPE 0x000f 229#define T_MASKTYPE 0x001f
223#define T_SYNTAX 0x0010 230#define T_SYNTAX 0x0020
224#define T_IMMUTABLE 0x0020 231#define T_IMMUTABLE 0x0040
225#define T_ATOM 0x0040 /* only for gc */ 232#define T_ATOM 0x0080 /* only for gc */
226#define T_MARK 0x0080 /* only for gc */ 233//#define T_MARK 0x0080 /* only for gc */
227 234
228/* num, for generic arithmetic */ 235/* num, for generic arithmetic */
229struct num 236struct num
230{ 237{
231 IVALUE ivalue; 238 IVALUE ivalue;
… …
256static num num_op (enum num_op op, num a, num b); 263static num num_op (enum num_op op, num a, num b);
257static num num_intdiv (num a, num b); 264static num num_intdiv (num a, num b);
258static num num_rem (num a, num b); 265static num num_rem (num a, num b);
259static num num_mod (num a, num b); 266static num num_mod (num a, num b);
260 267
261#if USE_MATH
262static double round_per_R5RS (double x);
263#endif
264static int is_zero_rvalue (RVALUE x); 268static int is_zero_rvalue (RVALUE x);
265 269
266static num num_zero; 270static num num_zero;
267static num num_one; 271static num num_one;
268 272
273/* convert "pointer" to cell* / cell* to pointer */
274#define CELL(p) ((struct cell *)(p) + 0)
275#define POINTER(c) ((void *)((c) - 0))
276
269/* macros for cell operations */ 277/* macros for cell operations */
270#define typeflag(p) ((p)->flag + 0) 278#define typeflag(p) (CELL(p)->flag + 0)
271#define set_typeflag(p,v) ((p)->flag = (v)) 279#define set_typeflag(p,v) (CELL(p)->flag = (v))
272#define type(p) (typeflag (p) & T_MASKTYPE) 280#define type(p) (typeflag (p) & T_MASKTYPE)
273 281
274INTERFACE int 282INTERFACE int
275is_string (pointer p) 283is_string (pointer p)
276{ 284{
277 return type (p) == T_STRING; 285 return type (p) == T_STRING;
278} 286}
279 287
280#define strvalue(p) ((p)->object.string.svalue) 288#define strvalue(p) (CELL(p)->object.string.svalue)
281#define strlength(p) ((p)->object.string.length) 289#define strlength(p) (CELL(p)->object.string.length)
282 290
283INTERFACE int 291INTERFACE int
284is_vector (pointer p) 292is_vector (pointer p)
285{ 293{
286 return type (p) == T_VECTOR; 294 return type (p) == T_VECTOR;
287} 295}
288 296
289#define vecvalue(p) ((p)->object.vector.vvalue) 297#define vecvalue(p) (CELL(p)->object.vector.vvalue)
290#define veclength(p) ((p)->object.vector.length) 298#define veclength(p) (CELL(p)->object.vector.length)
291INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj); 299INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
292INTERFACE pointer vector_get (pointer vec, uint32_t ielem); 300INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
293INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a); 301INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
294 302
295INTERFACE int 303INTERFACE int
… …
321string_value (pointer p) 329string_value (pointer p)
322{ 330{
323 return strvalue (p); 331 return strvalue (p);
324} 332}
325 333
326#define ivalue_unchecked(p) (p)->object.ivalue 334#define ivalue_unchecked(p) (CELL(p)->object.ivalue + 0)
327#define set_ivalue(p,v) (p)->object.ivalue = (v) 335#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
328 336
329#if USE_REAL 337#if USE_REAL
330#define rvalue_unchecked(p) (p)->object.rvalue 338#define rvalue_unchecked(p) CELL(p)->object.rvalue
331#define set_rvalue(p,v) (p)->object.rvalue = (v) 339#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
332#else 340#else
333#define rvalue_unchecked(p) (p)->object.ivalue 341#define rvalue_unchecked(p) CELL(p)->object.ivalue
334#define set_rvalue(p,v) (p)->object.ivalue = (v) 342#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
335#endif 343#endif
336 344
337INTERFACE long 345INTERFACE long
338charvalue (pointer p) 346charvalue (pointer p)
339{ 347{
340 return ivalue_unchecked (p); 348 return ivalue_unchecked (p);
341} 349}
342 350
351#define port(p) CELL(p)->object.port
352#define set_port(p,v) port(p) = (v)
343INTERFACE int 353INTERFACE int
344is_port (pointer p) 354is_port (pointer p)
345{ 355{
346 return type (p) == T_PORT; 356 return type (p) == T_PORT;
347} 357}
348 358
349INTERFACE int 359INTERFACE int
350is_inport (pointer p) 360is_inport (pointer p)
351{ 361{
352 return is_port (p) && p->object.port->kind & port_input; 362 return is_port (p) && port (p)->kind & port_input;
353} 363}
354 364
355INTERFACE int 365INTERFACE int
356is_outport (pointer p) 366is_outport (pointer p)
357{ 367{
358 return is_port (p) && p->object.port->kind & port_output; 368 return is_port (p) && port (p)->kind & port_output;
359} 369}
360 370
361INTERFACE int 371INTERFACE int
362is_pair (pointer p) 372is_pair (pointer p)
363{ 373{
364 return type (p) == T_PAIR; 374 return type (p) == T_PAIR;
365} 375}
366 376
367#define car(p) ((p)->object.cons.car + 0) 377#define car(p) (POINTER (CELL(p)->object.cons.car))
368#define cdr(p) ((p)->object.cons.cdr + 0) 378#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
369 379
370static pointer caar (pointer p) { return car (car (p)); } 380static pointer caar (pointer p) { return car (car (p)); }
371static pointer cadr (pointer p) { return car (cdr (p)); } 381static pointer cadr (pointer p) { return car (cdr (p)); }
372static pointer cdar (pointer p) { return cdr (car (p)); } 382static pointer cdar (pointer p) { return cdr (car (p)); }
373static pointer cddr (pointer p) { return cdr (cdr (p)); } 383static pointer cddr (pointer p) { return cdr (cdr (p)); }
374 384
375static pointer cadar (pointer p) { return car (cdr (car (p))); } 385static pointer cadar (pointer p) { return car (cdr (car (p))); }
376static pointer caddr (pointer p) { return car (cdr (cdr (p))); } 386static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
377static pointer cdaar (pointer p) { return cdr (car (car (p))); } 387static pointer cdaar (pointer p) { return cdr (car (car (p))); }
378 388
389static pointer cadddr (pointer p) { return car (car (car (cdr (p)))); }
390
379INTERFACE void 391INTERFACE void
380set_car (pointer p, pointer q) 392set_car (pointer p, pointer q)
381{ 393{
382 p->object.cons.car = q; 394 CELL(p)->object.cons.car = CELL (q);
383} 395}
384 396
385INTERFACE void 397INTERFACE void
386set_cdr (pointer p, pointer q) 398set_cdr (pointer p, pointer q)
387{ 399{
388 p->object.cons.cdr = q; 400 CELL(p)->object.cons.cdr = CELL (q);
389} 401}
390 402
391INTERFACE pointer 403INTERFACE pointer
392pair_car (pointer p) 404pair_car (pointer p)
393{ 405{
… …
411{ 423{
412 return strvalue (p); 424 return strvalue (p);
413} 425}
414 426
415#if USE_PLIST 427#if USE_PLIST
428#error plists are broken because symbols are no longer pairs
429#define symprop(p) cdr(p)
416SCHEME_EXPORT int 430SCHEME_EXPORT int
417hasprop (pointer p) 431hasprop (pointer p)
418{ 432{
419 return typeflag (p) & T_SYMBOL; 433 return typeflag (p) & T_SYMBOL;
420} 434}
421
422# define symprop(p) cdr(p)
423#endif 435#endif
424 436
425INTERFACE int 437INTERFACE int
426is_syntax (pointer p) 438is_syntax (pointer p)
427{ 439{
… …
499 511
500#define is_atom(p) (typeflag (p) & T_ATOM) 512#define is_atom(p) (typeflag (p) & T_ATOM)
501#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM) 513#define setatom(p) set_typeflag ((p), typeflag (p) | T_ATOM)
502#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM) 514#define clratom(p) set_typeflag ((p), typeflag (p) & ~T_ATOM)
503 515
516#if 1
517#define is_mark(p) (CELL(p)->mark)
518#define setmark(p) (CELL(p)->mark = 1)
519#define clrmark(p) (CELL(p)->mark = 0)
520#else
504#define is_mark(p) (typeflag (p) & T_MARK) 521#define is_mark(p) (typeflag (p) & T_MARK)
505#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 522#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
506#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 523#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
524#endif
507 525
508INTERFACE int 526INTERFACE int
509is_immutable (pointer p) 527is_immutable (pointer p)
510{ 528{
511 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 529 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
… …
523 proper list: length 541 proper list: length
524 circular list: -1 542 circular list: -1
525 not even a pair: -2 543 not even a pair: -2
526 dotted list: -2 minus length before dot 544 dotted list: -2 minus length before dot
527*/ 545*/
528INTERFACE int 546ecb_hot INTERFACE int
529list_length (SCHEME_P_ pointer a) 547list_length (SCHEME_P_ pointer a)
530{ 548{
531 int i = 0; 549 int i = 0;
532 pointer slow, fast; 550 pointer slow, fast;
533 551
… …
572{ 590{
573 return list_length (SCHEME_A_ a) >= 0; 591 return list_length (SCHEME_A_ a) >= 0;
574} 592}
575 593
576#if USE_CHAR_CLASSIFIERS 594#if USE_CHAR_CLASSIFIERS
595
577ecb_inline int 596ecb_inline int
578Cisalpha (int c) 597Cisalpha (int c)
579{ 598{
580 return isascii (c) && isalpha (c); 599 return isascii (c) && isalpha (c);
581} 600}
… …
639 "gs", 658 "gs",
640 "rs", 659 "rs",
641 "us" 660 "us"
642}; 661};
643 662
644static int 663ecb_cold static int
645is_ascii_name (const char *name, int *pc) 664is_ascii_name (const char *name, int *pc)
646{ 665{
647 int i; 666 int i;
648 667
649 for (i = 0; i < 32; i++) 668 for (i = 0; i < 32; i++)
… …
668 687
669static int file_push (SCHEME_P_ const char *fname); 688static int file_push (SCHEME_P_ const char *fname);
670static void file_pop (SCHEME_P); 689static void file_pop (SCHEME_P);
671static int file_interactive (SCHEME_P); 690static int file_interactive (SCHEME_P);
672ecb_inline int is_one_of (const char *s, int c); 691ecb_inline int is_one_of (const char *s, int c);
673static int alloc_cellseg (SCHEME_P_ int n); 692static int alloc_cellseg (SCHEME_P);
674ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 693ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
675static void finalize_cell (SCHEME_P_ pointer a); 694static void finalize_cell (SCHEME_P_ pointer a);
676static int count_consecutive_cells (pointer x, int needed);
677static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 695static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
678static pointer mk_number (SCHEME_P_ const num n); 696static pointer mk_number (SCHEME_P_ const num n);
679static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 697static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
680static pointer mk_vector (SCHEME_P_ uint32_t len); 698static pointer mk_vector (SCHEME_P_ uint32_t len);
681static pointer mk_atom (SCHEME_P_ char *q); 699static pointer mk_atom (SCHEME_P_ char *q);
682static pointer mk_sharp_const (SCHEME_P_ char *name); 700static pointer mk_sharp_const (SCHEME_P_ char *name);
683 701
702static pointer mk_port (SCHEME_P_ port *p);
703
684#if USE_PORTS 704#if USE_PORTS
685static pointer mk_port (SCHEME_P_ port *p);
686static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 705static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
687static pointer port_from_file (SCHEME_P_ int, int prop); 706static pointer port_from_file (SCHEME_P_ int, int prop);
688static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 707static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
689static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop); 708static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop);
690static port *port_rep_from_file (SCHEME_P_ int, int prop); 709static port *port_rep_from_file (SCHEME_P_ int, int prop);
691static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 710static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
692static void port_close (SCHEME_P_ pointer p, int flag); 711static void port_close (SCHEME_P_ pointer p, int flag);
693#endif 712#endif
713
694static void mark (pointer a); 714static void mark (pointer a);
695static void gc (SCHEME_P_ pointer a, pointer b); 715static void gc (SCHEME_P_ pointer a, pointer b);
696static int basic_inchar (port *pt); 716static int basic_inchar (port *pt);
697static int inchar (SCHEME_P); 717static int inchar (SCHEME_P);
698static void backchar (SCHEME_P_ int c); 718static void backchar (SCHEME_P_ int c);
699static char *readstr_upto (SCHEME_P_ int skip, const char *delim); 719static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
700static pointer readstrexp (SCHEME_P_ char delim); 720static pointer readstrexp (SCHEME_P_ char delim);
701ecb_inline int skipspace (SCHEME_P); 721static int skipspace (SCHEME_P);
702static int token (SCHEME_P); 722static int token (SCHEME_P);
703static void printslashstring (SCHEME_P_ char *s, int len); 723static void printslashstring (SCHEME_P_ char *s, int len);
704static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 724static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
705static void printatom (SCHEME_P_ pointer l, int f); 725static void printatom (SCHEME_P_ pointer l, int f);
706static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 726static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
872 } 892 }
873 893
874 return ret; 894 return ret;
875} 895}
876 896
877#if USE_MATH
878
879/* Round to nearest. Round to even if midway */
880static double
881round_per_R5RS (double x)
882{
883 double fl = floor (x);
884 double ce = ceil (x);
885 double dfl = x - fl;
886 double dce = ce - x;
887
888 if (dfl > dce)
889 return ce;
890 else if (dfl < dce)
891 return fl;
892 else
893 {
894 if (fmod (fl, 2) == 0) /* I imagine this holds */
895 return fl;
896 else
897 return ce;
898 }
899}
900#endif
901
902static int 897static int
903is_zero_rvalue (RVALUE x) 898is_zero_rvalue (RVALUE x)
904{ 899{
905 return x == 0; 900 return x == 0;
906#if 0 901#if 0
… …
911#endif 906#endif
912#endif 907#endif
913} 908}
914 909
915/* allocate new cell segment */ 910/* allocate new cell segment */
916static int 911ecb_cold static int
917alloc_cellseg (SCHEME_P_ int n) 912alloc_cellseg (SCHEME_P)
918{ 913{
919 pointer newp; 914 struct cell *newp;
920 pointer last; 915 struct cell *last;
921 pointer p; 916 struct cell *p;
922 char *cp; 917 char *cp;
923 long i; 918 long i;
924 int k; 919 int k;
925 920
926 static int segsize = CELL_SEGSIZE >> 1; 921 static int segsize = CELL_SEGSIZE >> 1;
927 segsize <<= 1; 922 segsize <<= 1;
928 923
929 for (k = 0; k < n; k++)
930 {
931 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
932 return k;
933
934 cp = malloc (segsize * sizeof (struct cell)); 924 cp = malloc (segsize * sizeof (struct cell));
935 925
936 if (!cp && USE_ERROR_CHECKING) 926 if (!cp && USE_ERROR_CHECKING)
937 return k; 927 return k;
938 928
939 i = ++SCHEME_V->last_cell_seg; 929 i = ++SCHEME_V->last_cell_seg;
940 SCHEME_V->alloc_seg[i] = cp;
941 930
942 newp = (pointer)cp; 931 newp = (struct cell *)cp;
943 SCHEME_V->cell_seg[i] = newp; 932 SCHEME_V->cell_seg[i] = newp;
944 SCHEME_V->cell_segsize[i] = segsize; 933 SCHEME_V->cell_segsize[i] = segsize;
945 SCHEME_V->fcells += segsize; 934 SCHEME_V->fcells += segsize;
946 last = newp + segsize - 1; 935 last = newp + segsize - 1;
947 936
948 for (p = newp; p <= last; p++) 937 for (p = newp; p <= last; p++)
949 { 938 {
939 pointer cp = POINTER (p);
940 clrmark (cp);
950 set_typeflag (p, T_PAIR); 941 set_typeflag (cp, T_PAIR);
951 set_car (p, NIL); 942 set_car (cp, NIL);
952 set_cdr (p, p + 1); 943 set_cdr (cp, POINTER (p + 1));
953 } 944 }
954 945
955 set_cdr (last, SCHEME_V->free_cell); 946 set_cdr (POINTER (last), SCHEME_V->free_cell);
956 SCHEME_V->free_cell = newp; 947 SCHEME_V->free_cell = POINTER (newp);
957 }
958 948
959 return n; 949 return 1;
960} 950}
961 951
962/* get new cell. parameter a, b is marked by gc. */ 952/* get new cell. parameter a, b is marked by gc. */
963ecb_inline pointer 953ecb_inline pointer
964get_cell_x (SCHEME_P_ pointer a, pointer b) 954get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
968 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 958 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
969 return S_SINK; 959 return S_SINK;
970 960
971 if (SCHEME_V->free_cell == NIL) 961 if (SCHEME_V->free_cell == NIL)
972 { 962 {
973 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 963 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
974 964
975 gc (SCHEME_A_ a, b); 965 gc (SCHEME_A_ a, b);
976 966
977 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 967 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
978 { 968 {
979 /* if only a few recovered, get more to avoid fruitless gc's */ 969 /* if only a few recovered, get more to avoid fruitless gc's */
980 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 970 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
981 { 971 {
982#if USE_ERROR_CHECKING 972#if USE_ERROR_CHECKING
983 SCHEME_V->no_memory = 1; 973 SCHEME_V->no_memory = 1;
984 return S_SINK; 974 return S_SINK;
985#endif 975#endif
… …
997 } 987 }
998} 988}
999 989
1000/* To retain recent allocs before interpreter knows about them - 990/* To retain recent allocs before interpreter knows about them -
1001 Tehom */ 991 Tehom */
1002 992ecb_hot static void
1003static void
1004push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 993push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1005{ 994{
1006 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 995 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1007 996
1008 set_typeflag (holder, T_PAIR); 997 set_typeflag (holder, T_PAIR);
… …
1010 set_car (holder, recent); 999 set_car (holder, recent);
1011 set_cdr (holder, car (S_SINK)); 1000 set_cdr (holder, car (S_SINK));
1012 set_car (S_SINK, holder); 1001 set_car (S_SINK, holder);
1013} 1002}
1014 1003
1015static pointer 1004ecb_hot static pointer
1016get_cell (SCHEME_P_ pointer a, pointer b) 1005get_cell (SCHEME_P_ pointer a, pointer b)
1017{ 1006{
1018 pointer cell = get_cell_x (SCHEME_A_ a, b); 1007 pointer cell = get_cell_x (SCHEME_A_ a, b);
1019 1008
1020 /* For right now, include "a" and "b" in "cell" so that gc doesn't 1009 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
1029} 1018}
1030 1019
1031static pointer 1020static pointer
1032get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1021get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1033{ 1022{
1034 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1023 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1035 pointer *e = malloc (len * sizeof (pointer)); 1024 pointer *e = malloc (len * sizeof (pointer));
1036 1025
1037 if (!e && USE_ERROR_CHECKING) 1026 if (!e && USE_ERROR_CHECKING)
1038 return S_SINK; 1027 return S_SINK;
1039 1028
1040 /* Record it as a vector so that gc understands it. */ 1029 /* Record it as a vector so that gc understands it. */
1041 set_typeflag (v, T_VECTOR | T_ATOM); 1030 set_typeflag (v, T_VECTOR | T_ATOM);
1042 1031
1043 v->object.vector.vvalue = e; 1032 CELL(v)->object.vector.vvalue = e;
1044 v->object.vector.length = len; 1033 CELL(v)->object.vector.length = len;
1045 fill_vector (v, 0, init); 1034 fill_vector (v, 0, init);
1046 push_recent_alloc (SCHEME_A_ v, NIL); 1035 push_recent_alloc (SCHEME_A_ v, NIL);
1047 1036
1048 return v; 1037 return v;
1049} 1038}
… …
1058static void 1047static void
1059check_cell_alloced (pointer p, int expect_alloced) 1048check_cell_alloced (pointer p, int expect_alloced)
1060{ 1049{
1061 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1050 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1062 if (typeflag (p) & !expect_alloced) 1051 if (typeflag (p) & !expect_alloced)
1063 xwrstr ("Cell is already allocated!\n"); 1052 putstr (SCHEME_A_ "Cell is already allocated!\n");
1064 1053
1065 if (!(typeflag (p)) & expect_alloced) 1054 if (!(typeflag (p)) & expect_alloced)
1066 xwrstr ("Cell is not allocated!\n"); 1055 putstr (SCHEME_A_ "Cell is not allocated!\n");
1067} 1056}
1068 1057
1069static void 1058static void
1070check_range_alloced (pointer p, int n, int expect_alloced) 1059check_range_alloced (pointer p, int n, int expect_alloced)
1071{ 1060{
… …
1077#endif 1066#endif
1078 1067
1079/* Medium level cell allocation */ 1068/* Medium level cell allocation */
1080 1069
1081/* get new cons cell */ 1070/* get new cons cell */
1082pointer 1071ecb_hot static pointer
1083xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1072xcons (SCHEME_P_ pointer a, pointer b)
1084{ 1073{
1085 pointer x = get_cell (SCHEME_A_ a, b); 1074 pointer x = get_cell (SCHEME_A_ a, b);
1086 1075
1087 set_typeflag (x, T_PAIR); 1076 set_typeflag (x, T_PAIR);
1088
1089 if (immutable)
1090 setimmutable (x);
1091 1077
1092 set_car (x, a); 1078 set_car (x, a);
1093 set_cdr (x, b); 1079 set_cdr (x, b);
1094 1080
1095 return x; 1081 return x;
1096} 1082}
1097 1083
1098/* ========== oblist implementation ========== */
1099
1100static pointer 1084ecb_hot static pointer
1085ximmutable_cons (SCHEME_P_ pointer a, pointer b)
1086{
1087 pointer x = xcons (SCHEME_A_ a, b);
1088 setimmutable (x);
1089 return x;
1090}
1091
1092#define cons(a,b) xcons (SCHEME_A_ a, b)
1093#define immutable_cons(a,b) ximmutable_cons (SCHEME_A_ a, b)
1094
1095ecb_cold static pointer
1101generate_symbol (SCHEME_P_ const char *name) 1096generate_symbol (SCHEME_P_ const char *name)
1102{ 1097{
1103 pointer x = mk_string (SCHEME_A_ name); 1098 pointer x = mk_string (SCHEME_A_ name);
1104 setimmutable (x); 1099 setimmutable (x);
1105 set_typeflag (x, T_SYMBOL | T_ATOM); 1100 set_typeflag (x, T_SYMBOL | T_ATOM);
1106 return x; 1101 return x;
1107} 1102}
1108 1103
1104/* ========== oblist implementation ========== */
1105
1109#ifndef USE_OBJECT_LIST 1106#ifndef USE_OBJECT_LIST
1110 1107
1111static int 1108static int
1112hash_fn (const char *key, int table_size) 1109hash_fn (const char *key, int table_size)
1113{ 1110{
1114 const unsigned char *p = key; 1111 const unsigned char *p = (unsigned char *)key;
1115 uint32_t hash = 2166136261; 1112 uint32_t hash = 2166136261U;
1116 1113
1117 while (*p) 1114 while (*p)
1118 hash = (hash ^ *p++) * 16777619; 1115 hash = (hash ^ *p++) * 16777619;
1119 1116
1120 return hash % table_size; 1117 return hash % table_size;
1121} 1118}
1122 1119
1123static pointer 1120ecb_cold static pointer
1124oblist_initial_value (SCHEME_P) 1121oblist_initial_value (SCHEME_P)
1125{ 1122{
1126 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1123 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1127} 1124}
1128 1125
1129/* returns the new symbol */ 1126/* returns the new symbol */
1130static pointer 1127ecb_cold static pointer
1131oblist_add_by_name (SCHEME_P_ const char *name) 1128oblist_add_by_name (SCHEME_P_ const char *name)
1132{ 1129{
1133 pointer x = generate_symbol (SCHEME_A_ name); 1130 pointer x = generate_symbol (SCHEME_A_ name);
1134 int location = hash_fn (name, veclength (SCHEME_V->oblist)); 1131 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))); 1132 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1136 return x; 1133 return x;
1137} 1134}
1138 1135
1139ecb_inline pointer 1136ecb_cold static pointer
1140oblist_find_by_name (SCHEME_P_ const char *name) 1137oblist_find_by_name (SCHEME_P_ const char *name)
1141{ 1138{
1142 int location; 1139 int location;
1143 pointer x; 1140 pointer x;
1144 char *s; 1141 char *s;
… …
1155 } 1152 }
1156 1153
1157 return NIL; 1154 return NIL;
1158} 1155}
1159 1156
1160static pointer 1157ecb_cold static pointer
1161oblist_all_symbols (SCHEME_P) 1158oblist_all_symbols (SCHEME_P)
1162{ 1159{
1163 int i; 1160 int i;
1164 pointer x; 1161 pointer x;
1165 pointer ob_list = NIL; 1162 pointer ob_list = NIL;
… …
1171 return ob_list; 1168 return ob_list;
1172} 1169}
1173 1170
1174#else 1171#else
1175 1172
1176static pointer 1173ecb_cold static pointer
1177oblist_initial_value (SCHEME_P) 1174oblist_initial_value (SCHEME_P)
1178{ 1175{
1179 return NIL; 1176 return NIL;
1180} 1177}
1181 1178
1182ecb_inline pointer 1179ecb_cold static pointer
1183oblist_find_by_name (SCHEME_P_ const char *name) 1180oblist_find_by_name (SCHEME_P_ const char *name)
1184{ 1181{
1185 pointer x; 1182 pointer x;
1186 char *s; 1183 char *s;
1187 1184
… …
1196 1193
1197 return NIL; 1194 return NIL;
1198} 1195}
1199 1196
1200/* returns the new symbol */ 1197/* returns the new symbol */
1201static pointer 1198ecb_cold static pointer
1202oblist_add_by_name (SCHEME_P_ const char *name) 1199oblist_add_by_name (SCHEME_P_ const char *name)
1203{ 1200{
1204 pointer x = mk_string (SCHEME_A_ name); 1201 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); 1202 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1208 return x; 1203 return x;
1209} 1204}
1210 1205
1211static pointer 1206ecb_cold static pointer
1212oblist_all_symbols (SCHEME_P) 1207oblist_all_symbols (SCHEME_P)
1213{ 1208{
1214 return SCHEME_V->oblist; 1209 return SCHEME_V->oblist;
1215} 1210}
1216 1211
1217#endif 1212#endif
1218 1213
1219#if USE_PORTS
1220static pointer 1214ecb_cold static pointer
1221mk_port (SCHEME_P_ port *p) 1215mk_port (SCHEME_P_ port *p)
1222{ 1216{
1223 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1217 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1224 1218
1225 set_typeflag (x, T_PORT | T_ATOM); 1219 set_typeflag (x, T_PORT | T_ATOM);
1226 x->object.port = p; 1220 set_port (x, p);
1227 1221
1228 return x; 1222 return x;
1229} 1223}
1230#endif
1231 1224
1232pointer 1225ecb_cold pointer
1233mk_foreign_func (SCHEME_P_ foreign_func f) 1226mk_foreign_func (SCHEME_P_ foreign_func f)
1234{ 1227{
1235 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1228 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1236 1229
1237 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1230 set_typeflag (x, T_FOREIGN | T_ATOM);
1238 x->object.ff = f; 1231 CELL(x)->object.ff = f;
1239 1232
1240 return x; 1233 return x;
1241} 1234}
1242 1235
1243INTERFACE pointer 1236INTERFACE pointer
1244mk_character (SCHEME_P_ int c) 1237mk_character (SCHEME_P_ int c)
1245{ 1238{
1246 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1239 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1247 1240
1248 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1241 set_typeflag (x, T_CHARACTER | T_ATOM);
1249 set_ivalue (x, c & 0xff); 1242 set_ivalue (x, c & 0xff);
1250 1243
1251 return x; 1244 return x;
1252} 1245}
1253 1246
1254/* get number atom (integer) */ 1247/* get number atom (integer) */
1255INTERFACE pointer 1248INTERFACE pointer
1256mk_integer (SCHEME_P_ long n) 1249mk_integer (SCHEME_P_ long n)
1257{ 1250{
1251 pointer p = 0;
1252 pointer *pp = &p;
1253
1254#if USE_INTCACHE
1255 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1256 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1257#endif
1258
1259 if (!*pp)
1260 {
1258 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1261 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1259 1262
1260 set_typeflag (x, (T_INTEGER | T_ATOM)); 1263 set_typeflag (x, T_INTEGER | T_ATOM);
1264 setimmutable (x); /* shouldn't do anything, doesn't cost anything */
1261 set_ivalue (x, n); 1265 set_ivalue (x, n);
1262 1266
1267 *pp = x;
1268 }
1269
1263 return x; 1270 return *pp;
1264} 1271}
1265 1272
1266INTERFACE pointer 1273INTERFACE pointer
1267mk_real (SCHEME_P_ RVALUE n) 1274mk_real (SCHEME_P_ RVALUE n)
1268{ 1275{
1269#if USE_REAL 1276#if USE_REAL
1270 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1277 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1271 1278
1272 set_typeflag (x, (T_REAL | T_ATOM)); 1279 set_typeflag (x, T_REAL | T_ATOM);
1273 set_rvalue (x, n); 1280 set_rvalue (x, n);
1274 1281
1275 return x; 1282 return x;
1276#else 1283#else
1277 return mk_integer (SCHEME_A_ n); 1284 return mk_integer (SCHEME_A_ n);
… …
1388 x = oblist_add_by_name (SCHEME_A_ name); 1395 x = oblist_add_by_name (SCHEME_A_ name);
1389 1396
1390 return x; 1397 return x;
1391} 1398}
1392 1399
1393INTERFACE pointer 1400ecb_cold INTERFACE pointer
1394gensym (SCHEME_P) 1401gensym (SCHEME_P)
1395{ 1402{
1396 pointer x; 1403 pointer x;
1397 char name[40] = "gensym-"; 1404 char name[40] = "gensym-";
1398 xnum (name + 7, ++SCHEME_V->gensym_cnt); 1405 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1399 1406
1400 return generate_symbol (SCHEME_A_ name); 1407 return generate_symbol (SCHEME_A_ name);
1401} 1408}
1402 1409
1410static int
1411is_gensym (SCHEME_P_ pointer x)
1412{
1413 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1414}
1415
1403/* make symbol or number atom from string */ 1416/* make symbol or number atom from string */
1404static pointer 1417ecb_cold static pointer
1405mk_atom (SCHEME_P_ char *q) 1418mk_atom (SCHEME_P_ char *q)
1406{ 1419{
1407 char c, *p; 1420 char c, *p;
1408 int has_dec_point = 0; 1421 int has_dec_point = 0;
1409 int has_fp_exp = 0; 1422 int has_fp_exp = 0;
… …
1480 1493
1481 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1494 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1482} 1495}
1483 1496
1484/* make constant */ 1497/* make constant */
1485static pointer 1498ecb_cold static pointer
1486mk_sharp_const (SCHEME_P_ char *name) 1499mk_sharp_const (SCHEME_P_ char *name)
1487{ 1500{
1488 if (!strcmp (name, "t")) 1501 if (!strcmp (name, "t"))
1489 return S_T; 1502 return S_T;
1490 else if (!strcmp (name, "f")) 1503 else if (!strcmp (name, "f"))
1491 return S_F; 1504 return S_F;
1492 else if (*name == '\\') /* #\w (character) */ 1505 else if (*name == '\\') /* #\w (character) */
1493 { 1506 {
1494 int c; 1507 int c;
1495 1508
1509 // TODO: optimise
1496 if (stricmp (name + 1, "space") == 0) 1510 if (stricmp (name + 1, "space") == 0)
1497 c = ' '; 1511 c = ' ';
1498 else if (stricmp (name + 1, "newline") == 0) 1512 else if (stricmp (name + 1, "newline") == 0)
1499 c = '\n'; 1513 c = '\n';
1500 else if (stricmp (name + 1, "return") == 0) 1514 else if (stricmp (name + 1, "return") == 0)
1501 c = '\r'; 1515 c = '\r';
1502 else if (stricmp (name + 1, "tab") == 0) 1516 else if (stricmp (name + 1, "tab") == 0)
1503 c = '\t'; 1517 c = '\t';
1518 else if (stricmp (name + 1, "alarm") == 0)
1519 c = 0x07;
1520 else if (stricmp (name + 1, "backspace") == 0)
1521 c = 0x08;
1522 else if (stricmp (name + 1, "escape") == 0)
1523 c = 0x1b;
1524 else if (stricmp (name + 1, "delete") == 0)
1525 c = 0x7f;
1526 else if (stricmp (name + 1, "null") == 0)
1527 c = 0;
1504 else if (name[1] == 'x' && name[2] != 0) 1528 else if (name[1] == 'x' && name[2] != 0)
1505 { 1529 {
1506 long c1 = strtol (name + 2, 0, 16); 1530 long c1 = strtol (name + 2, 0, 16);
1507 1531
1508 if (0 <= c1 && c1 <= UCHAR_MAX) 1532 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1522 return mk_character (SCHEME_A_ c); 1546 return mk_character (SCHEME_A_ c);
1523 } 1547 }
1524 else 1548 else
1525 { 1549 {
1526 /* identify base by string index */ 1550 /* identify base by string index */
1527 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x"; 1551 const char baseidx[18] = "ffbf" "ffff" "ofdf" "ffff" "x";
1528 char *base = strchr (baseidx, *name); 1552 char *base = strchr (baseidx, *name);
1529 1553
1530 if (base) 1554 if (base && *base)
1531 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx)); 1555 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1532 1556
1533 return NIL; 1557 return NIL;
1534 } 1558 }
1535} 1559}
1536 1560
1537/* ========== garbage collector ========== */ 1561/* ========== garbage collector ========== */
1562
1563static void
1564finalize_cell (SCHEME_P_ pointer a)
1565{
1566 /* TODO, fast bitmap check? */
1567 if (is_string (a) || is_symbol (a))
1568 free (strvalue (a));
1569 else if (is_vector (a))
1570 free (vecvalue (a));
1571#if USE_PORTS
1572 else if (is_port (a))
1573 {
1574 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1575 port_close (SCHEME_A_ a, port_input | port_output);
1576
1577 free (port (a));
1578 }
1579#endif
1580}
1538 1581
1539/*-- 1582/*--
1540 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1583 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1541 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1584 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1542 * for marking. 1585 * for marking.
1543 * 1586 *
1544 * The exception is vectors - vectors are currently marked recursively, 1587 * The exception is vectors - vectors are currently marked recursively,
1545 * which is inherited form tinyscheme and could be fixed by having another 1588 * which is inherited form tinyscheme and could be fixed by having another
1546 * word of context in the vector 1589 * word of context in the vector
1547 */ 1590 */
1548static void 1591ecb_hot static void
1549mark (pointer a) 1592mark (pointer a)
1550{ 1593{
1551 pointer t, q, p; 1594 pointer t, q, p;
1552 1595
1553 t = 0; 1596 t = 0;
… …
1610 p = q; 1653 p = q;
1611 goto E6; 1654 goto E6;
1612 } 1655 }
1613} 1656}
1614 1657
1658ecb_hot static void
1659gc_free (SCHEME_P)
1660{
1661 int i;
1662 uint32_t total = 0;
1663
1664 /* Here we scan the cells to build the free-list. */
1665 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1666 {
1667 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1668 struct cell *p;
1669 total += SCHEME_V->cell_segsize [i];
1670
1671 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1672 {
1673 pointer c = POINTER (p);
1674
1675 if (is_mark (c))
1676 clrmark (c);
1677 else
1678 {
1679 /* reclaim cell */
1680 if (typeflag (c) != T_PAIR)
1681 {
1682 finalize_cell (SCHEME_A_ c);
1683 set_typeflag (c, T_PAIR);
1684 set_car (c, NIL);
1685 }
1686
1687 ++SCHEME_V->fcells;
1688 set_cdr (c, SCHEME_V->free_cell);
1689 SCHEME_V->free_cell = c;
1690 }
1691 }
1692 }
1693
1694 if (SCHEME_V->gc_verbose)
1695 {
1696 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");
1697 }
1698}
1699
1615/* garbage collection. parameter a, b is marked. */ 1700/* garbage collection. parameter a, b is marked. */
1616static void 1701ecb_cold static void
1617gc (SCHEME_P_ pointer a, pointer b) 1702gc (SCHEME_P_ pointer a, pointer b)
1618{ 1703{
1619 pointer p;
1620 int i; 1704 int i;
1621 1705
1622 if (SCHEME_V->gc_verbose) 1706 if (SCHEME_V->gc_verbose)
1623 putstr (SCHEME_A_ "gc..."); 1707 putstr (SCHEME_A_ "gc...");
1624 1708
… …
1640 /* Mark recent objects the interpreter doesn't know about yet. */ 1724 /* Mark recent objects the interpreter doesn't know about yet. */
1641 mark (car (S_SINK)); 1725 mark (car (S_SINK));
1642 /* Mark any older stuff above nested C calls */ 1726 /* Mark any older stuff above nested C calls */
1643 mark (SCHEME_V->c_nest); 1727 mark (SCHEME_V->c_nest);
1644 1728
1729#if USE_INTCACHE
1730 /* mark intcache */
1731 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1732 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1733 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1734#endif
1735
1645 /* mark variables a, b */ 1736 /* mark variables a, b */
1646 mark (a); 1737 mark (a);
1647 mark (b); 1738 mark (b);
1648 1739
1649 /* garbage collect */ 1740 /* garbage collect */
1650 clrmark (NIL); 1741 clrmark (NIL);
1651 SCHEME_V->fcells = 0; 1742 SCHEME_V->fcells = 0;
1652 SCHEME_V->free_cell = NIL; 1743 SCHEME_V->free_cell = NIL;
1653 1744
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) 1745 if (SCHEME_V->gc_verbose)
1685 { 1746 putstr (SCHEME_A_ "freeing...");
1686 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1687 }
1688}
1689 1747
1690static void 1748 gc_free (SCHEME_A);
1691finalize_cell (SCHEME_P_ pointer a)
1692{
1693 /* TODO, fast bitmap check? */
1694 if (is_string (a) || is_symbol (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} 1749}
1708 1750
1709/* ========== Routines for Reading ========== */ 1751/* ========== Routines for Reading ========== */
1710 1752
1711static int 1753ecb_cold static int
1712file_push (SCHEME_P_ const char *fname) 1754file_push (SCHEME_P_ const char *fname)
1713{ 1755{
1714#if USE_PORTS
1715 int fin; 1756 int fin;
1716 1757
1717 if (SCHEME_V->file_i == MAXFIL - 1) 1758 if (SCHEME_V->file_i == MAXFIL - 1)
1718 return 0; 1759 return 0;
1719 1760
… …
1725 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1766 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1726 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1767 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; 1768 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; 1769 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1729 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1770 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1730 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1771 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1731 1772
1732#if SHOW_ERROR_LINE 1773#if SHOW_ERROR_LINE
1733 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1774 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1734 1775
1735 if (fname) 1776 if (fname)
1736 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0); 1777 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0);
1737#endif 1778#endif
1738 } 1779 }
1739 1780
1740 return fin >= 0; 1781 return fin >= 0;
1741
1742#else
1743 return 1;
1744#endif
1745} 1782}
1746 1783
1747static void 1784ecb_cold static void
1748file_pop (SCHEME_P) 1785file_pop (SCHEME_P)
1749{ 1786{
1750 if (SCHEME_V->file_i != 0) 1787 if (SCHEME_V->file_i != 0)
1751 { 1788 {
1752 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1789 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1753#if USE_PORTS 1790#if USE_PORTS
1754 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1791 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1755#endif 1792#endif
1756 SCHEME_V->file_i--; 1793 SCHEME_V->file_i--;
1757 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1794 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1758 } 1795 }
1759} 1796}
1760 1797
1761static int 1798ecb_cold static int
1762file_interactive (SCHEME_P) 1799file_interactive (SCHEME_P)
1763{ 1800{
1764#if USE_PORTS 1801#if USE_PORTS
1765 return SCHEME_V->file_i == 0 1802 return SCHEME_V->file_i == 0
1766 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1803 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1767 && (SCHEME_V->inport->object.port->kind & port_file); 1804 && (port (SCHEME_V->inport)->kind & port_file);
1768#else 1805#else
1769 return 0; 1806 return 0;
1770#endif 1807#endif
1771} 1808}
1772 1809
1773#if USE_PORTS 1810#if USE_PORTS
1774static port * 1811ecb_cold static port *
1775port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1812port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1776{ 1813{
1777 int fd; 1814 int fd;
1778 int flags; 1815 int flags;
1779 char *rw; 1816 char *rw;
… …
1802# endif 1839# endif
1803 1840
1804 return pt; 1841 return pt;
1805} 1842}
1806 1843
1807static pointer 1844ecb_cold static pointer
1808port_from_filename (SCHEME_P_ const char *fn, int prop) 1845port_from_filename (SCHEME_P_ const char *fn, int prop)
1809{ 1846{
1810 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1847 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1811 1848
1812 if (!pt && USE_ERROR_CHECKING) 1849 if (!pt && USE_ERROR_CHECKING)
1813 return NIL; 1850 return NIL;
1814 1851
1815 return mk_port (SCHEME_A_ pt); 1852 return mk_port (SCHEME_A_ pt);
1816} 1853}
1817 1854
1818static port * 1855ecb_cold static port *
1819port_rep_from_file (SCHEME_P_ int f, int prop) 1856port_rep_from_file (SCHEME_P_ int f, int prop)
1820{ 1857{
1821 port *pt = malloc (sizeof *pt); 1858 port *pt = malloc (sizeof *pt);
1822 1859
1823 if (!pt && USE_ERROR_CHECKING) 1860 if (!pt && USE_ERROR_CHECKING)
… …
1828 pt->rep.stdio.file = f; 1865 pt->rep.stdio.file = f;
1829 pt->rep.stdio.closeit = 0; 1866 pt->rep.stdio.closeit = 0;
1830 return pt; 1867 return pt;
1831} 1868}
1832 1869
1833static pointer 1870ecb_cold static pointer
1834port_from_file (SCHEME_P_ int f, int prop) 1871port_from_file (SCHEME_P_ int f, int prop)
1835{ 1872{
1836 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1873 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1837 1874
1838 if (!pt && USE_ERROR_CHECKING) 1875 if (!pt && USE_ERROR_CHECKING)
1839 return NIL; 1876 return NIL;
1840 1877
1841 return mk_port (SCHEME_A_ pt); 1878 return mk_port (SCHEME_A_ pt);
1842} 1879}
1843 1880
1844static port * 1881ecb_cold static port *
1845port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1882port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1846{ 1883{
1847 port *pt = malloc (sizeof (port)); 1884 port *pt = malloc (sizeof (port));
1848 1885
1849 if (!pt && USE_ERROR_CHECKING) 1886 if (!pt && USE_ERROR_CHECKING)
… …
1855 pt->rep.string.curr = start; 1892 pt->rep.string.curr = start;
1856 pt->rep.string.past_the_end = past_the_end; 1893 pt->rep.string.past_the_end = past_the_end;
1857 return pt; 1894 return pt;
1858} 1895}
1859 1896
1860static pointer 1897ecb_cold static pointer
1861port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1898port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1862{ 1899{
1863 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1900 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1864 1901
1865 if (!pt && USE_ERROR_CHECKING) 1902 if (!pt && USE_ERROR_CHECKING)
… …
1868 return mk_port (SCHEME_A_ pt); 1905 return mk_port (SCHEME_A_ pt);
1869} 1906}
1870 1907
1871# define BLOCK_SIZE 256 1908# define BLOCK_SIZE 256
1872 1909
1873static port * 1910ecb_cold static port *
1874port_rep_from_scratch (SCHEME_P) 1911port_rep_from_scratch (SCHEME_P)
1875{ 1912{
1876 char *start; 1913 char *start;
1877 port *pt = malloc (sizeof (port)); 1914 port *pt = malloc (sizeof (port));
1878 1915
… …
1892 pt->rep.string.curr = start; 1929 pt->rep.string.curr = start;
1893 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1930 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1894 return pt; 1931 return pt;
1895} 1932}
1896 1933
1897static pointer 1934ecb_cold static pointer
1898port_from_scratch (SCHEME_P) 1935port_from_scratch (SCHEME_P)
1899{ 1936{
1900 port *pt = port_rep_from_scratch (SCHEME_A); 1937 port *pt = port_rep_from_scratch (SCHEME_A);
1901 1938
1902 if (!pt && USE_ERROR_CHECKING) 1939 if (!pt && USE_ERROR_CHECKING)
1903 return NIL; 1940 return NIL;
1904 1941
1905 return mk_port (SCHEME_A_ pt); 1942 return mk_port (SCHEME_A_ pt);
1906} 1943}
1907 1944
1908static void 1945ecb_cold static void
1909port_close (SCHEME_P_ pointer p, int flag) 1946port_close (SCHEME_P_ pointer p, int flag)
1910{ 1947{
1911 port *pt = p->object.port; 1948 port *pt = port (p);
1912 1949
1913 pt->kind &= ~flag; 1950 pt->kind &= ~flag;
1914 1951
1915 if ((pt->kind & (port_input | port_output)) == 0) 1952 if ((pt->kind & (port_input | port_output)) == 0)
1916 { 1953 {
… …
1933 } 1970 }
1934} 1971}
1935#endif 1972#endif
1936 1973
1937/* get new character from input file */ 1974/* get new character from input file */
1938static int 1975ecb_cold static int
1939inchar (SCHEME_P) 1976inchar (SCHEME_P)
1940{ 1977{
1941 int c; 1978 int c;
1942 port *pt; 1979 port *pt = port (SCHEME_V->inport);
1943
1944 pt = SCHEME_V->inport->object.port;
1945 1980
1946 if (pt->kind & port_saw_EOF) 1981 if (pt->kind & port_saw_EOF)
1947 return EOF; 1982 return EOF;
1948 1983
1949 c = basic_inchar (pt); 1984 c = basic_inchar (pt);
… …
1959 } 1994 }
1960 1995
1961 return c; 1996 return c;
1962} 1997}
1963 1998
1964static int ungot = -1; 1999ecb_cold static int
1965
1966static int
1967basic_inchar (port *pt) 2000basic_inchar (port *pt)
1968{ 2001{
1969#if USE_PORTS
1970 if (pt->unget != -1) 2002 if (pt->unget != -1)
1971 { 2003 {
1972 int r = pt->unget; 2004 int r = pt->unget;
1973 pt->unget = -1; 2005 pt->unget = -1;
1974 return r; 2006 return r;
1975 } 2007 }
1976 2008
2009#if USE_PORTS
1977 if (pt->kind & port_file) 2010 if (pt->kind & port_file)
1978 { 2011 {
1979 char c; 2012 char c;
1980 2013
1981 if (!read (pt->rep.stdio.file, &c, 1)) 2014 if (!read (pt->rep.stdio.file, &c, 1))
… …
1989 return EOF; 2022 return EOF;
1990 else 2023 else
1991 return *pt->rep.string.curr++; 2024 return *pt->rep.string.curr++;
1992 } 2025 }
1993#else 2026#else
1994 if (ungot == -1)
1995 {
1996 char c; 2027 char c;
1997 if (!read (0, &c, 1)) 2028
2029 if (!read (pt->rep.stdio.file, &c, 1))
1998 return EOF; 2030 return EOF;
1999 2031
2000 ungot = c;
2001 }
2002
2003 {
2004 int r = ungot;
2005 ungot = -1;
2006 return r; 2032 return c;
2007 }
2008#endif 2033#endif
2009} 2034}
2010 2035
2011/* back character to input buffer */ 2036/* back character to input buffer */
2012static void 2037ecb_cold static void
2013backchar (SCHEME_P_ int c) 2038backchar (SCHEME_P_ int c)
2014{ 2039{
2015#if USE_PORTS 2040 port *pt = port (SCHEME_V->inport);
2016 port *pt;
2017 2041
2018 if (c == EOF) 2042 if (c == EOF)
2019 return; 2043 return;
2020 2044
2021 pt = SCHEME_V->inport->object.port;
2022 pt->unget = c; 2045 pt->unget = c;
2023#else
2024 if (c == EOF)
2025 return;
2026
2027 ungot = c;
2028#endif
2029} 2046}
2030 2047
2031#if USE_PORTS 2048#if USE_PORTS
2032static int 2049ecb_cold static int
2033realloc_port_string (SCHEME_P_ port *p) 2050realloc_port_string (SCHEME_P_ port *p)
2034{ 2051{
2035 char *start = p->rep.string.start; 2052 char *start = p->rep.string.start;
2036 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2053 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
2037 char *str = malloc (new_size); 2054 char *str = malloc (new_size);
… …
2050 else 2067 else
2051 return 0; 2068 return 0;
2052} 2069}
2053#endif 2070#endif
2054 2071
2055INTERFACE void 2072ecb_cold static void
2056putstr (SCHEME_P_ const char *s) 2073putchars (SCHEME_P_ const char *s, int len)
2057{ 2074{
2075 port *pt = port (SCHEME_V->outport);
2076
2058#if USE_PORTS 2077#if USE_PORTS
2059 port *pt = SCHEME_V->outport->object.port;
2060
2061 if (pt->kind & port_file)
2062 write (pt->rep.stdio.file, s, strlen (s));
2063 else
2064 for (; *s; s++)
2065 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2066 *pt->rep.string.curr++ = *s;
2067 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2068 *pt->rep.string.curr++ = *s;
2069
2070#else
2071 xwrstr (s);
2072#endif
2073}
2074
2075static void
2076putchars (SCHEME_P_ const char *s, int len)
2077{
2078#if USE_PORTS
2079 port *pt = SCHEME_V->outport->object.port;
2080
2081 if (pt->kind & port_file) 2078 if (pt->kind & port_file)
2082 write (pt->rep.stdio.file, s, len); 2079 write (pt->rep.stdio.file, s, len);
2083 else 2080 else
2084 { 2081 {
2085 for (; len; len--) 2082 for (; len; len--)
… …
2090 *pt->rep.string.curr++ = *s++; 2087 *pt->rep.string.curr++ = *s++;
2091 } 2088 }
2092 } 2089 }
2093 2090
2094#else 2091#else
2095 write (1, s, len); 2092 write (1, s, len); // output not initialised
2096#endif 2093#endif
2094}
2095
2096INTERFACE void
2097putstr (SCHEME_P_ const char *s)
2098{
2099 putchars (SCHEME_A_ s, strlen (s));
2097} 2100}
2098 2101
2099INTERFACE void 2102INTERFACE void
2100putcharacter (SCHEME_P_ int c) 2103putcharacter (SCHEME_P_ int c)
2101{ 2104{
2102#if USE_PORTS
2103 port *pt = SCHEME_V->outport->object.port;
2104
2105 if (pt->kind & port_file)
2106 {
2107 char cc = c;
2108 write (pt->rep.stdio.file, &cc, 1);
2109 }
2110 else
2111 {
2112 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2113 *pt->rep.string.curr++ = c;
2114 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2115 *pt->rep.string.curr++ = c;
2116 }
2117
2118#else
2119 char cc = c; 2105 char cc = c;
2120 write (1, &c, 1); 2106
2121#endif 2107 putchars (SCHEME_A_ &cc, 1);
2122} 2108}
2123 2109
2124/* read characters up to delimiter, but cater to character constants */ 2110/* read characters up to delimiter, but cater to character constants */
2125static char * 2111ecb_cold static char *
2126readstr_upto (SCHEME_P_ int skip, const char *delim) 2112readstr_upto (SCHEME_P_ int skip, const char *delim)
2127{ 2113{
2128 char *p = SCHEME_V->strbuff + skip; 2114 char *p = SCHEME_V->strbuff + skip;
2129 2115
2130 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2116 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
… …
2139 2125
2140 return SCHEME_V->strbuff; 2126 return SCHEME_V->strbuff;
2141} 2127}
2142 2128
2143/* read string expression "xxx...xxx" */ 2129/* read string expression "xxx...xxx" */
2144static pointer 2130ecb_cold static pointer
2145readstrexp (SCHEME_P_ char delim) 2131readstrexp (SCHEME_P_ char delim)
2146{ 2132{
2147 char *p = SCHEME_V->strbuff; 2133 char *p = SCHEME_V->strbuff;
2148 int c; 2134 int c;
2149 int c1 = 0; 2135 int c1 = 0;
… …
2182 case '7': 2168 case '7':
2183 state = st_oct1; 2169 state = st_oct1;
2184 c1 = c - '0'; 2170 c1 = c - '0';
2185 break; 2171 break;
2186 2172
2173 case 'a': *p++ = '\a'; state = st_ok; break;
2174 case 'n': *p++ = '\n'; state = st_ok; break;
2175 case 'r': *p++ = '\r'; state = st_ok; break;
2176 case 't': *p++ = '\t'; state = st_ok; break;
2177
2178 // this overshoots the minimum requirements of r7rs
2179 case ' ':
2180 case '\t':
2181 case '\r':
2182 case '\n':
2183 skipspace (SCHEME_A);
2184 state = st_ok;
2185 break;
2186
2187 //TODO: x should end in ;, not two-digit hex
2187 case 'x': 2188 case 'x':
2188 case 'X': 2189 case 'X':
2189 state = st_x1; 2190 state = st_x1;
2190 c1 = 0; 2191 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; 2192 break;
2207 2193
2208 default: 2194 default:
2209 *p++ = c; 2195 *p++ = c;
2210 state = st_ok; 2196 state = st_ok;
… …
2262 } 2248 }
2263 } 2249 }
2264} 2250}
2265 2251
2266/* check c is in chars */ 2252/* check c is in chars */
2267ecb_inline int 2253ecb_cold int
2268is_one_of (const char *s, int c) 2254is_one_of (const char *s, int c)
2269{ 2255{
2270 return c == EOF || !!strchr (s, c); 2256 return c == EOF || !!strchr (s, c);
2271} 2257}
2272 2258
2273/* skip white characters */ 2259/* skip white characters */
2274ecb_inline int 2260ecb_cold int
2275skipspace (SCHEME_P) 2261skipspace (SCHEME_P)
2276{ 2262{
2277 int c, curr_line = 0; 2263 int c, curr_line = 0;
2278 2264
2279 do 2265 do
… …
2299 backchar (SCHEME_A_ c); 2285 backchar (SCHEME_A_ c);
2300 return 1; 2286 return 1;
2301} 2287}
2302 2288
2303/* get token */ 2289/* get token */
2304static int 2290ecb_cold static int
2305token (SCHEME_P) 2291token (SCHEME_P)
2306{ 2292{
2307 int c = skipspace (SCHEME_A); 2293 int c = skipspace (SCHEME_A);
2308 2294
2309 if (c == EOF) 2295 if (c == EOF)
… …
2407} 2393}
2408 2394
2409/* ========== Routines for Printing ========== */ 2395/* ========== Routines for Printing ========== */
2410#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2396#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2411 2397
2412static void 2398ecb_cold static void
2413printslashstring (SCHEME_P_ char *p, int len) 2399printslashstring (SCHEME_P_ char *p, int len)
2414{ 2400{
2415 int i; 2401 int i;
2416 unsigned char *s = (unsigned char *) p; 2402 unsigned char *s = (unsigned char *) p;
2417 2403
… …
2473 2459
2474 putcharacter (SCHEME_A_ '"'); 2460 putcharacter (SCHEME_A_ '"');
2475} 2461}
2476 2462
2477/* print atoms */ 2463/* print atoms */
2478static void 2464ecb_cold static void
2479printatom (SCHEME_P_ pointer l, int f) 2465printatom (SCHEME_P_ pointer l, int f)
2480{ 2466{
2481 char *p; 2467 char *p;
2482 int len; 2468 int len;
2483 2469
2484 atom2str (SCHEME_A_ l, f, &p, &len); 2470 atom2str (SCHEME_A_ l, f, &p, &len);
2485 putchars (SCHEME_A_ p, len); 2471 putchars (SCHEME_A_ p, len);
2486} 2472}
2487 2473
2488/* Uses internal buffer unless string pointer is already available */ 2474/* Uses internal buffer unless string pointer is already available */
2489static void 2475ecb_cold static void
2490atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2476atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2491{ 2477{
2492 char *p; 2478 char *p;
2493 2479
2494 if (l == NIL) 2480 if (l == NIL)
… …
2627 } 2613 }
2628 else if (is_symbol (l)) 2614 else if (is_symbol (l))
2629 p = symname (l); 2615 p = symname (l);
2630 else if (is_proc (l)) 2616 else if (is_proc (l))
2631 { 2617 {
2618 p = (char *)procname (l); // ok with r7rs display, but not r7rs write
2619#if 0
2632#if USE_PRINTF 2620#if USE_PRINTF
2633 p = SCHEME_V->strbuff; 2621 p = SCHEME_V->strbuff;
2634 snprintf (p, STRBUFFSIZE, "#<%s PROCEDURE %ld>", procname (l), procnum (l)); 2622 snprintf (p, STRBUFFSIZE, " PROCEDURE %ld>", procname (l), procnum (l));
2635#else 2623#else
2636 p = "#<PROCEDURE>"; 2624 p = "#<PROCEDURE>";
2625#endif
2637#endif 2626#endif
2638 } 2627 }
2639 else if (is_macro (l)) 2628 else if (is_macro (l))
2640 p = "#<MACRO>"; 2629 p = "#<MACRO>";
2641 else if (is_closure (l)) 2630 else if (is_closure (l))
… …
2701 return car (d); 2690 return car (d);
2702 2691
2703 p = cons (car (d), cdr (d)); 2692 p = cons (car (d), cdr (d));
2704 q = p; 2693 q = p;
2705 2694
2706 while (cdr (cdr (p)) != NIL) 2695 while (cddr (p) != NIL)
2707 { 2696 {
2708 d = cons (car (p), cdr (p)); 2697 d = cons (car (p), cdr (p));
2709 2698
2710 if (cdr (cdr (p)) != NIL) 2699 if (cddr (p) != NIL)
2711 p = cdr (d); 2700 p = cdr (d);
2712 } 2701 }
2713 2702
2714 set_cdr (p, car (cdr (p))); 2703 set_cdr (p, cadr (p));
2715 return q; 2704 return q;
2716} 2705}
2717 2706
2718/* reverse list -- produce new list */ 2707/* reverse list -- produce new list */
2719static pointer 2708ecb_hot static pointer
2720reverse (SCHEME_P_ pointer a) 2709reverse (SCHEME_P_ pointer a)
2721{ 2710{
2722 /* a must be checked by gc */ 2711 /* a must be checked by gc */
2723 pointer p = NIL; 2712 pointer p = NIL;
2724 2713
… …
2727 2716
2728 return p; 2717 return p;
2729} 2718}
2730 2719
2731/* reverse list --- in-place */ 2720/* reverse list --- in-place */
2732static pointer 2721ecb_hot static pointer
2733reverse_in_place (SCHEME_P_ pointer term, pointer list) 2722reverse_in_place (SCHEME_P_ pointer term, pointer list)
2734{ 2723{
2735 pointer result = term; 2724 pointer result = term;
2736 pointer p = list; 2725 pointer p = list;
2737 2726
… …
2745 2734
2746 return result; 2735 return result;
2747} 2736}
2748 2737
2749/* append list -- produce new list (in reverse order) */ 2738/* append list -- produce new list (in reverse order) */
2750static pointer 2739ecb_hot static pointer
2751revappend (SCHEME_P_ pointer a, pointer b) 2740revappend (SCHEME_P_ pointer a, pointer b)
2752{ 2741{
2753 pointer result = a; 2742 pointer result = a;
2754 pointer p = b; 2743 pointer p = b;
2755 2744
… …
2764 2753
2765 return S_F; /* signal an error */ 2754 return S_F; /* signal an error */
2766} 2755}
2767 2756
2768/* equivalence of atoms */ 2757/* equivalence of atoms */
2769int 2758ecb_hot int
2770eqv (pointer a, pointer b) 2759eqv (pointer a, pointer b)
2771{ 2760{
2772 if (is_string (a)) 2761 if (is_string (a))
2773 { 2762 {
2774 if (is_string (b)) 2763 if (is_string (b))
… …
2831{ 2820{
2832 pointer new_frame; 2821 pointer new_frame;
2833 2822
2834 /* The interaction-environment has about 300 variables in it. */ 2823 /* The interaction-environment has about 300 variables in it. */
2835 if (old_env == NIL) 2824 if (old_env == NIL)
2836 new_frame = mk_vector (SCHEME_A_ 461); 2825 new_frame = mk_vector (SCHEME_A_ 29); // was 461
2837 else 2826 else
2838 new_frame = NIL; 2827 new_frame = NIL;
2839 2828
2840 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2829 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2841 setenvironment (SCHEME_V->envir); 2830 setenvironment (SCHEME_V->envir);
… …
2868 } 2857 }
2869 else 2858 else
2870 set_car (env, immutable_cons (slot, car (env))); 2859 set_car (env, immutable_cons (slot, car (env)));
2871} 2860}
2872 2861
2873static pointer 2862ecb_hot static pointer
2874find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2863find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2875{ 2864{
2876 pointer x, y; 2865 pointer x, y;
2877 2866
2878 for (x = env; x != NIL; x = cdr (x)) 2867 for (x = env; x != NIL; x = cdr (x))
… …
2899 return NIL; 2888 return NIL;
2900} 2889}
2901 2890
2902#else /* USE_ALIST_ENV */ 2891#else /* USE_ALIST_ENV */
2903 2892
2904ecb_inline void 2893static void
2905new_frame_in_env (SCHEME_P_ pointer old_env) 2894new_frame_in_env (SCHEME_P_ pointer old_env)
2906{ 2895{
2907 SCHEME_V->envir = immutable_cons (NIL, old_env); 2896 SCHEME_V->envir = immutable_cons (NIL, old_env);
2908 setenvironment (SCHEME_V->envir); 2897 setenvironment (SCHEME_V->envir);
2909} 2898}
2910 2899
2911ecb_inline void 2900static void
2912new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2901new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2913{ 2902{
2914 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2903 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2915} 2904}
2916 2905
2917static pointer 2906ecb_hot static pointer
2918find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2907find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2919{ 2908{
2920 pointer x, y; 2909 pointer x, y;
2921 2910
2922 for (x = env; x != NIL; x = cdr (x)) 2911 for (x = env; x != NIL; x = cdr (x))
… …
2936 return NIL; 2925 return NIL;
2937} 2926}
2938 2927
2939#endif /* USE_ALIST_ENV else */ 2928#endif /* USE_ALIST_ENV else */
2940 2929
2941ecb_inline void 2930static void
2942new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2931new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2943{ 2932{
2944 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2 2933 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2945 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2934 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2946} 2935}
2947 2936
2948ecb_inline void 2937static void
2949set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2938set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2950{ 2939{
2951 set_cdr (slot, value); 2940 set_cdr (slot, value);
2952} 2941}
2953 2942
2954ecb_inline pointer 2943static pointer
2955slot_value_in_env (pointer slot) 2944slot_value_in_env (pointer slot)
2956{ 2945{
2957 return cdr (slot); 2946 return cdr (slot);
2958} 2947}
2959 2948
2960/* ========== Evaluation Cycle ========== */ 2949/* ========== Evaluation Cycle ========== */
2961 2950
2962static int 2951ecb_cold static int
2963xError_1 (SCHEME_P_ const char *s, pointer a) 2952xError_1 (SCHEME_P_ const char *s, pointer a)
2964{ 2953{
2965#if USE_ERROR_HOOK
2966 pointer x;
2967 pointer hdl = SCHEME_V->ERROR_HOOK;
2968#endif
2969
2970#if USE_PRINTF 2954#if USE_PRINTF
2971#if SHOW_ERROR_LINE 2955#if SHOW_ERROR_LINE
2972 char sbuf[STRBUFFSIZE]; 2956 char sbuf[STRBUFFSIZE];
2973 2957
2974 /* make sure error is not in REPL */ 2958 /* make sure error is not in REPL */
… …
2989 } 2973 }
2990#endif 2974#endif
2991#endif 2975#endif
2992 2976
2993#if USE_ERROR_HOOK 2977#if USE_ERROR_HOOK
2994 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2978 pointer x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->ERROR_HOOK, 1);
2995 2979
2996 if (x != NIL) 2980 if (x != NIL)
2997 { 2981 {
2998 pointer code = a 2982 pointer code = a
2999 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2983 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3043 pointer code; 3027 pointer code;
3044}; 3028};
3045 3029
3046# define STACK_GROWTH 3 3030# define STACK_GROWTH 3
3047 3031
3048static void 3032ecb_hot static void
3049s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3033s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3050{ 3034{
3051 int nframes = (uintptr_t)SCHEME_V->dump; 3035 int nframes = (uintptr_t)SCHEME_V->dump;
3052 struct dump_stack_frame *next_frame; 3036 struct dump_stack_frame *next_frame;
3053 3037
3054 /* enough room for the next frame? */ 3038 /* enough room for the next frame? */
3055 if (nframes >= SCHEME_V->dump_size) 3039 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3056 { 3040 {
3057 SCHEME_V->dump_size += STACK_GROWTH; 3041 SCHEME_V->dump_size += STACK_GROWTH;
3058 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3042 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3059 } 3043 }
3060 3044
… …
3066 next_frame->code = code; 3050 next_frame->code = code;
3067 3051
3068 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3052 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3069} 3053}
3070 3054
3071static int 3055static ecb_hot int
3072xs_return (SCHEME_P_ pointer a) 3056xs_return (SCHEME_P_ pointer a)
3073{ 3057{
3074 int nframes = (uintptr_t)SCHEME_V->dump; 3058 int nframes = (uintptr_t)SCHEME_V->dump;
3075 struct dump_stack_frame *frame; 3059 struct dump_stack_frame *frame;
3076 3060
… …
3087 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3071 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3088 3072
3089 return 0; 3073 return 0;
3090} 3074}
3091 3075
3092ecb_inline void 3076ecb_cold void
3093dump_stack_reset (SCHEME_P) 3077dump_stack_reset (SCHEME_P)
3094{ 3078{
3095 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3079 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3096 SCHEME_V->dump = (pointer)+0; 3080 SCHEME_V->dump = (pointer)+0;
3097} 3081}
3098 3082
3099ecb_inline void 3083ecb_cold void
3100dump_stack_initialize (SCHEME_P) 3084dump_stack_initialize (SCHEME_P)
3101{ 3085{
3102 SCHEME_V->dump_size = 0; 3086 SCHEME_V->dump_size = 0;
3103 SCHEME_V->dump_base = 0; 3087 SCHEME_V->dump_base = 0;
3104 dump_stack_reset (SCHEME_A); 3088 dump_stack_reset (SCHEME_A);
3105} 3089}
3106 3090
3107static void 3091ecb_cold static void
3108dump_stack_free (SCHEME_P) 3092dump_stack_free (SCHEME_P)
3109{ 3093{
3110 free (SCHEME_V->dump_base); 3094 free (SCHEME_V->dump_base);
3111 SCHEME_V->dump_base = 0; 3095 SCHEME_V->dump_base = 0;
3112 SCHEME_V->dump = (pointer)0; 3096 SCHEME_V->dump = (pointer)0;
3113 SCHEME_V->dump_size = 0; 3097 SCHEME_V->dump_size = 0;
3114} 3098}
3115 3099
3116static void 3100ecb_cold static void
3117dump_stack_mark (SCHEME_P) 3101dump_stack_mark (SCHEME_P)
3118{ 3102{
3119 int nframes = (uintptr_t)SCHEME_V->dump; 3103 int nframes = (uintptr_t)SCHEME_V->dump;
3120 int i; 3104 int i;
3121 3105
… …
3127 mark (frame->envir); 3111 mark (frame->envir);
3128 mark (frame->code); 3112 mark (frame->code);
3129 } 3113 }
3130} 3114}
3131 3115
3132static pointer 3116ecb_cold static pointer
3133ss_get_cont (SCHEME_P) 3117ss_get_cont (SCHEME_P)
3134{ 3118{
3135 int nframes = (uintptr_t)SCHEME_V->dump; 3119 int nframes = (uintptr_t)SCHEME_V->dump;
3136 int i; 3120 int i;
3137 3121
… …
3149 } 3133 }
3150 3134
3151 return cont; 3135 return cont;
3152} 3136}
3153 3137
3154static void 3138ecb_cold static void
3155ss_set_cont (SCHEME_P_ pointer cont) 3139ss_set_cont (SCHEME_P_ pointer cont)
3156{ 3140{
3157 int i = 0; 3141 int i = 0;
3158 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3142 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3159 3143
… …
3171 SCHEME_V->dump = (pointer)(uintptr_t)i; 3155 SCHEME_V->dump = (pointer)(uintptr_t)i;
3172} 3156}
3173 3157
3174#else 3158#else
3175 3159
3176ecb_inline void 3160ecb_cold void
3177dump_stack_reset (SCHEME_P) 3161dump_stack_reset (SCHEME_P)
3178{ 3162{
3179 SCHEME_V->dump = NIL; 3163 SCHEME_V->dump = NIL;
3180} 3164}
3181 3165
3182ecb_inline void 3166ecb_cold void
3183dump_stack_initialize (SCHEME_P) 3167dump_stack_initialize (SCHEME_P)
3184{ 3168{
3185 dump_stack_reset (SCHEME_A); 3169 dump_stack_reset (SCHEME_A);
3186} 3170}
3187 3171
3188static void 3172ecb_cold static void
3189dump_stack_free (SCHEME_P) 3173dump_stack_free (SCHEME_P)
3190{ 3174{
3191 SCHEME_V->dump = NIL; 3175 SCHEME_V->dump = NIL;
3192} 3176}
3193 3177
3194static int 3178ecb_hot static int
3195xs_return (SCHEME_P_ pointer a) 3179xs_return (SCHEME_P_ pointer a)
3196{ 3180{
3197 pointer dump = SCHEME_V->dump; 3181 pointer dump = SCHEME_V->dump;
3198 3182
3199 SCHEME_V->value = a; 3183 SCHEME_V->value = a;
… …
3209 SCHEME_V->dump = dump; 3193 SCHEME_V->dump = dump;
3210 3194
3211 return 0; 3195 return 0;
3212} 3196}
3213 3197
3214static void 3198ecb_hot static void
3215s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3199s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3216{ 3200{
3217 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3201 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3218 cons (args, 3202 cons (args,
3219 cons (SCHEME_V->envir, 3203 cons (SCHEME_V->envir,
3220 cons (code, 3204 cons (code,
3221 SCHEME_V->dump)))); 3205 SCHEME_V->dump))));
3222} 3206}
3223 3207
3224static void 3208ecb_cold static void
3225dump_stack_mark (SCHEME_P) 3209dump_stack_mark (SCHEME_P)
3226{ 3210{
3227 mark (SCHEME_V->dump); 3211 mark (SCHEME_V->dump);
3228} 3212}
3229 3213
3230static pointer 3214ecb_cold static pointer
3231ss_get_cont (SCHEME_P) 3215ss_get_cont (SCHEME_P)
3232{ 3216{
3233 return SCHEME_V->dump; 3217 return SCHEME_V->dump;
3234} 3218}
3235 3219
3236static void 3220ecb_cold static void
3237ss_set_cont (SCHEME_P_ pointer cont) 3221ss_set_cont (SCHEME_P_ pointer cont)
3238{ 3222{
3239 SCHEME_V->dump = cont; 3223 SCHEME_V->dump = cont;
3240} 3224}
3241 3225
3242#endif 3226#endif
3243 3227
3244#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3228#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3245 3229
3246#if 1 3230#if EXPERIMENT
3231
3247static int 3232static int
3248debug (SCHEME_P_ int indent, pointer x) 3233dtree (SCHEME_P_ int indent, pointer x)
3249{ 3234{
3250 int c; 3235 int c;
3251 3236
3252 if (is_syntax (x)) 3237 if (is_syntax (x))
3253 { 3238 {
… …
3271 printf ("%*sS<%s>\n", indent, "", symname (x)); 3256 printf ("%*sS<%s>\n", indent, "", symname (x));
3272 return 24+8; 3257 return 24+8;
3273 3258
3274 case T_CLOSURE: 3259 case T_CLOSURE:
3275 printf ("%*sS<%s>\n", indent, "", "closure"); 3260 printf ("%*sS<%s>\n", indent, "", "closure");
3276 debug (SCHEME_A_ indent + 3, cdr(x)); 3261 dtree (SCHEME_A_ indent + 3, cdr(x));
3277 return 32 + debug (SCHEME_A_ indent + 3, car (x)); 3262 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3278 3263
3279 case T_PAIR: 3264 case T_PAIR:
3280 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x)); 3265 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3281 c = debug (SCHEME_A_ indent + 3, car (x)); 3266 c = dtree (SCHEME_A_ indent + 3, car (x));
3282 c += debug (SCHEME_A_ indent + 3, cdr (x)); 3267 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3283 return c + 1; 3268 return c + 1;
3284 3269
3285 case T_PORT: 3270 case T_PORT:
3286 printf ("%*sS<%s>\n", indent, "", "port"); 3271 printf ("%*sS<%s>\n", indent, "", "port");
3287 return 24+8; 3272 return 24+8;
… …
3290 printf ("%*sS<%s>\n", indent, "", "vector"); 3275 printf ("%*sS<%s>\n", indent, "", "vector");
3291 return 24+8; 3276 return 24+8;
3292 3277
3293 case T_ENVIRONMENT: 3278 case T_ENVIRONMENT:
3294 printf ("%*sS<%s>\n", indent, "", "environment"); 3279 printf ("%*sS<%s>\n", indent, "", "environment");
3295 return 0 + debug (SCHEME_A_ indent + 3, car (x)); 3280 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3296 3281
3297 default: 3282 default:
3298 printf ("unhandled type %d\n", type (x)); 3283 printf ("unhandled type %d\n", type (x));
3299 break; 3284 break;
3300 } 3285 }
3301} 3286}
3302#endif
3303 3287
3288#define DUMP(t) do { printf ("DUMP %s:%d\n", __FILE__, __LINE__); dtree (SCHEME_A_ 0, (t)); } while (0)
3289
3290typedef void *stream[1];
3291
3292#define stream_init() { 0 }
3293#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3294#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3295#define stream_free(s) free (s[0])
3296
3297ecb_cold static void
3298stream_put (stream s, uint8_t byte)
3299{
3300 uint32_t *sp = *s;
3301 uint32_t size = sizeof (uint32_t) * 2;
3302 uint32_t offs = size;
3303
3304 if (ecb_expect_true (sp))
3305 {
3306 offs = sp[0];
3307 size = sp[1];
3308 }
3309
3310 if (ecb_expect_false (offs == size))
3311 {
3312 size *= 2;
3313 sp = realloc (sp, size);
3314 *s = sp;
3315 sp[1] = size;
3316
3317 }
3318
3319 ((uint8_t *)sp)[offs++] = byte;
3320 sp[0] = offs;
3321}
3322
3323ecb_cold static void
3324stream_put_v (stream s, uint32_t v)
3325{
3326 while (v > 0x7f)
3327 {
3328 stream_put (s, v | 0x80);
3329 v >>= 7;
3330 }
3331
3332 stream_put (s, v);
3333}
3334
3335ecb_cold static void
3336stream_put_tv (stream s, int bop, uint32_t v)
3337{
3338 printf ("put tv %d %d\n", bop, v);//D
3339 stream_put (s, bop);
3340 stream_put_v (s, v);
3341}
3342
3343ecb_cold static void
3344stream_put_stream (stream s, stream o)
3345{
3346 uint32_t i;
3347
3348 for (i = 0; i < stream_size (o); ++i)
3349 stream_put (s, stream_data (o)[i]);
3350
3351 stream_free (o);
3352}
3353
3354ecb_cold static uint32_t
3355cell_id (SCHEME_P_ pointer x)
3356{
3357 struct cell *p = CELL (x);
3358 int i;
3359
3360 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3361 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3362 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3363
3364 abort ();
3365}
3366
3367// calculates a (preferably small) integer that makes it possible to find
3368// the symbol again. if pointers were offsets into a memory area... until
3369// then, we return segment number in the low bits, and offset in the high
3370// bits.
3371// also, this function must never return 0.
3372ecb_cold static uint32_t
3373symbol_id (SCHEME_P_ pointer sym)
3374{
3375 return cell_id (SCHEME_A_ sym);
3376}
3377
3378enum byteop
3379{
3380 BOP_NIL,
3381 BOP_INTEGER,
3382 BOP_SYMBOL,
3383 BOP_DATUM,
3384 BOP_LIST_BEG,
3385 BOP_LIST_END,
3386 BOP_IF,
3387 BOP_AND,
3388 BOP_OR,
3389 BOP_CASE,
3390 BOP_COND,
3391 BOP_LET,
3392 BOP_LETAST,
3393 BOP_LETREC,
3394 BOP_DEFINE,
3395 BOP_MACRO,
3396 BOP_SET,
3397 BOP_BEGIN,
3398 BOP_LAMBDA,
3399 BOP_DELAY,
3400 BOP_OP,
3401};
3402
3403ecb_cold static void compile_expr (SCHEME_P_ stream s, pointer x);
3404
3405ecb_cold static void
3406compile_list (SCHEME_P_ stream s, pointer x)
3407{
3408 // TODO: improper list
3409
3410 for (; x != NIL; x = cdr (x))
3411 {
3412 stream t = stream_init ();
3413 compile_expr (SCHEME_A_ t, car (x));
3414 stream_put_v (s, stream_size (t));
3415 stream_put_stream (s, t);
3416 }
3417
3418 stream_put_v (s, 0);
3419}
3420
3421static void
3422compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3423{
3424 stream sift = stream_init (); compile_expr (SCHEME_A_ sift, ift);
3425
3426 stream_put (s, BOP_IF);
3427 compile_expr (SCHEME_A_ s, cond);
3428 stream_put_v (s, stream_size (sift));
3429 stream_put_stream (s, sift);
3430 compile_expr (SCHEME_A_ s, iff);
3431}
3432
3433typedef uint32_t stream_fixup;
3434
3435static stream_fixup
3436stream_put_fixup (stream s)
3437{
3438 stream_put (s, 0);
3439 stream_put (s, 0);
3440
3441 return stream_size (s);
3442}
3443
3444static void
3445stream_fix_fixup (stream s, stream_fixup fixup, uint32_t target)
3446{
3447 target -= fixup;
3448 assert (target < (1 << 14));
3449 stream_data (s)[fixup - 2] = target | 0x80;
3450 stream_data (s)[fixup - 1] = target >> 7;
3451}
3452
3453static void
3454compile_and_or (SCHEME_P_ stream s, int and, pointer x)
3455{
3456 for (; cdr (x) != NIL; x = cdr (x))
3457 {
3458 stream t = stream_init ();
3459 compile_expr (SCHEME_A_ t, car (x));
3460 stream_put_v (s, stream_size (t));
3461 stream_put_stream (s, t);
3462 }
3463
3464 stream_put_v (s, 0);
3465}
3466
3467static void
3468compile_case (SCHEME_P_ stream s, pointer x)
3469{
3470 compile_expr (SCHEME_A_ s, caar (x));
3471
3472 for (;;)
3473 {
3474 x = cdr (x);
3475
3476 if (x == NIL)
3477 break;
3478
3479 compile_expr (SCHEME_A_ s, caar (x));
3480 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3481 stream_put_v (s, stream_size (t));
3482 stream_put_stream (s, t);
3483 }
3484
3485 stream_put_v (s, 0);
3486}
3487
3488static void
3489compile_cond (SCHEME_P_ stream s, pointer x)
3490{
3491 for ( ; x != NIL; x = cdr (x))
3492 {
3493 compile_expr (SCHEME_A_ s, caar (x));
3494 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3495 stream_put_v (s, stream_size (t));
3496 stream_put_stream (s, t);
3497 }
3498
3499 stream_put_v (s, 0);
3500}
3501
3304static int 3502static pointer
3503lookup (SCHEME_P_ pointer x)
3504{
3505 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, x, 1);
3506
3507 if (x != NIL)
3508 x = slot_value_in_env (x);
3509
3510 return x;
3511}
3512
3513ecb_cold static void
3514compile_expr (SCHEME_P_ stream s, pointer x)
3515{
3516 if (x == NIL)
3517 {
3518 stream_put (s, BOP_NIL);
3519 return;
3520 }
3521
3522 if (is_pair (x))
3523 {
3524 pointer head = car (x);
3525
3526 if (is_syntax (head))
3527 {
3528 int syn = syntaxnum (head);
3529 x = cdr (x);
3530
3531 switch (syntaxnum (head))
3532 {
3533 case OP_IF0: /* if */
3534 stream_put_v (s, BOP_IF);
3535 compile_if (SCHEME_A_ s, car (x), cadr (x), caddr (x));
3536 break;
3537
3538 case OP_OR0: /* or */
3539 stream_put_v (s, BOP_OR);
3540 compile_and_or (SCHEME_A_ s, 0, x);
3541 break;
3542
3543 case OP_AND0: /* and */
3544 stream_put_v (s, BOP_AND);
3545 compile_and_or (SCHEME_A_ s, 1, x);
3546 break;
3547
3548 case OP_CASE0: /* case */
3549 stream_put_v (s, BOP_CASE);
3550 compile_case (SCHEME_A_ s, x);
3551 break;
3552
3553 case OP_COND0: /* cond */
3554 stream_put_v (s, BOP_COND);
3555 compile_cond (SCHEME_A_ s, x);
3556 break;
3557
3558 case OP_LET0: /* let */
3559 case OP_LET0AST: /* let* */
3560 case OP_LET0REC: /* letrec */
3561 switch (syn)
3562 {
3563 case OP_LET0: stream_put (s, BOP_LET ); break;
3564 case OP_LET0AST: stream_put (s, BOP_LETAST); break;
3565 case OP_LET0REC: stream_put (s, BOP_LETREC); break;
3566 }
3567
3568 {
3569 pointer bindings = car (x);
3570 pointer body = cadr (x);
3571
3572 for (x = bindings; x != NIL; x = cdr (x))
3573 {
3574 pointer init = NIL;
3575 pointer var = car (x);
3576
3577 if (is_pair (var))
3578 {
3579 init = cdr (var);
3580 var = car (var);
3581 }
3582
3583 stream_put_v (s, symbol_id (SCHEME_A_ var));
3584 compile_expr (SCHEME_A_ s, init);
3585 }
3586
3587 stream_put_v (s, 0);
3588 compile_expr (SCHEME_A_ s, body);
3589 }
3590 break;
3591
3592 case OP_DEF0: /* define */
3593 case OP_MACRO0: /* macro */
3594 stream_put (s, syntaxnum (head) == OP_DEF0 ? BOP_DEFINE : BOP_MACRO);
3595 stream_put_v (s, cell_id (SCHEME_A_ car (x)));
3596 compile_expr (SCHEME_A_ s, cadr (x));
3597 break;
3598
3599 case OP_SET0: /* set! */
3600 stream_put (s, BOP_SET);
3601 stream_put_v (s, symbol_id (SCHEME_A_ car (x)));
3602 compile_expr (SCHEME_A_ s, cadr (x));
3603 break;
3604
3605 case OP_BEGIN: /* begin */
3606 stream_put (s, BOP_BEGIN);
3607 compile_list (SCHEME_A_ s, x);
3608 return;
3609
3610 case OP_QUOTE: /* quote */
3611 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3612 break;
3613
3614 case OP_DELAY: /* delay */
3615 stream_put (s, BOP_DELAY);
3616 compile_expr (SCHEME_A_ s, x);
3617 break;
3618
3619 case OP_LAMBDA: /* lambda */
3620 {
3621 pointer formals = car (x);
3622 pointer body = cadr (x);
3623
3624 stream_put (s, BOP_LAMBDA);
3625
3626 for (; is_pair (formals); formals = cdr (formals))
3627 stream_put_v (s, symbol_id (SCHEME_A_ car (formals)));
3628
3629 stream_put_v (s, 0);
3630 stream_put_v (s, formals == NIL ? 0 : symbol_id (SCHEME_A_ formals));
3631
3632 compile_expr (SCHEME_A_ s, body);
3633 }
3634 break;
3635
3636 case OP_C0STREAM:/* cons-stream */
3637 abort ();
3638 break;
3639 }
3640
3641 return;
3642 }
3643
3644 pointer m = lookup (SCHEME_A_ head);
3645
3646 if (is_macro (m))
3647 {
3648 s_save (SCHEME_A_ OP_DEBUG2, SCHEME_V->args, SCHEME_V->code);
3649 SCHEME_V->code = m;
3650 SCHEME_V->args = cons (x, NIL);
3651 Eval_Cycle (SCHEME_A_ OP_APPLY);
3652 x = SCHEME_V->value;
3653 compile_expr (SCHEME_A_ s, SCHEME_V->value);
3654 return;
3655 }
3656
3657 stream_put (s, BOP_LIST_BEG);
3658
3659 for (; x != NIL; x = cdr (x))
3660 compile_expr (SCHEME_A_ s, car (x));
3661
3662 stream_put (s, BOP_LIST_END);
3663 return;
3664 }
3665
3666 switch (type (x))
3667 {
3668 case T_INTEGER:
3669 {
3670 IVALUE iv = ivalue_unchecked (x);
3671 iv = iv < 0 ? ((~(uint32_t)iv) << 1) | 1 : (uint32_t)iv << 1;
3672 stream_put_tv (s, BOP_INTEGER, iv);
3673 }
3674 return;
3675
3676 case T_SYMBOL:
3677 if (0)
3678 {
3679 // no can do without more analysis
3680 pointer m = lookup (SCHEME_A_ x);
3681
3682 if (is_proc (m))
3683 {
3684 printf ("compile proc %s %d\n", procname(m), procnum(m));
3685 stream_put_tv (s, BOP_SYMBOL, BOP_OP + procnum (m));
3686 }
3687 else
3688 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3689 }
3690
3691 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3692 return;
3693
3694 default:
3695 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3696 break;
3697 }
3698}
3699
3700ecb_cold static int
3701compile_closure (SCHEME_P_ pointer p)
3702{
3703 stream s = stream_init ();
3704
3705 compile_list (SCHEME_A_ s, cdar (p));
3706
3707 FILE *xxd = popen ("xxd", "we");
3708 fwrite (stream_data (s), 1, stream_size (s), xxd);
3709 fclose (xxd);
3710
3711 return stream_size (s);
3712}
3713
3714#endif
3715
3716/* syntax, eval, core, ... */
3717ecb_hot static int
3305opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3718opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3306{ 3719{
3307 pointer args = SCHEME_V->args; 3720 pointer args = SCHEME_V->args;
3308 pointer x, y; 3721 pointer x, y;
3309 3722
3310 switch (op) 3723 switch (op)
3311 { 3724 {
3312#if 1 //D 3725#if EXPERIMENT //D
3313 case OP_DEBUG: 3726 case OP_DEBUG:
3314 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8); 3727 {
3728 uint32_t len = compile_closure (SCHEME_A_ car (args));
3729 printf ("len = %d\n", len);
3315 printf ("\n"); 3730 printf ("\n");
3316 s_return (S_T); 3731 s_return (S_T);
3732 }
3733
3734 case OP_DEBUG2:
3735 return -1;
3317#endif 3736#endif
3737
3318 case OP_LOAD: /* load */ 3738 case OP_LOAD: /* load */
3319 if (file_interactive (SCHEME_A)) 3739 if (file_interactive (SCHEME_A))
3320 { 3740 {
3321 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3741 putstr (SCHEME_A_ "Loading ");
3322 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3742 putstr (SCHEME_A_ strvalue (car (args)));
3743 putcharacter (SCHEME_A_ '\n');
3323 } 3744 }
3324 3745
3325 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3746 if (!file_push (SCHEME_A_ strvalue (car (args))))
3326 Error_1 ("unable to open", car (args)); 3747 Error_1 ("unable to open", car (args));
3327 else 3748
3328 {
3329 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3749 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3330 s_goto (OP_T0LVL); 3750 s_goto (OP_T0LVL);
3331 }
3332 3751
3333 case OP_T0LVL: /* top level */ 3752 case OP_T0LVL: /* top level */
3334 3753
3335 /* If we reached the end of file, this loop is done. */ 3754 /* If we reached the end of file, this loop is done. */
3336 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3755 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3337 { 3756 {
3338 if (SCHEME_V->file_i == 0) 3757 if (SCHEME_V->file_i == 0)
3339 { 3758 {
3340 SCHEME_V->args = NIL; 3759 SCHEME_V->args = NIL;
3341 s_goto (OP_QUIT); 3760 s_goto (OP_QUIT);
… …
3352 /* If interactive, be nice to user. */ 3771 /* If interactive, be nice to user. */
3353 if (file_interactive (SCHEME_A)) 3772 if (file_interactive (SCHEME_A))
3354 { 3773 {
3355 SCHEME_V->envir = SCHEME_V->global_env; 3774 SCHEME_V->envir = SCHEME_V->global_env;
3356 dump_stack_reset (SCHEME_A); 3775 dump_stack_reset (SCHEME_A);
3357 putstr (SCHEME_A_ "\n"); 3776 putcharacter (SCHEME_A_ '\n');
3777#if EXPERIMENT
3778 system ("ps v $PPID");
3779#endif
3358 putstr (SCHEME_A_ prompt); 3780 putstr (SCHEME_A_ prompt);
3359 } 3781 }
3360 3782
3361 /* Set up another iteration of REPL */ 3783 /* Set up another iteration of REPL */
3362 SCHEME_V->nesting = 0; 3784 SCHEME_V->nesting = 0;
… …
3397 { 3819 {
3398 SCHEME_V->print_flag = 1; 3820 SCHEME_V->print_flag = 1;
3399 SCHEME_V->args = SCHEME_V->value; 3821 SCHEME_V->args = SCHEME_V->value;
3400 s_goto (OP_P0LIST); 3822 s_goto (OP_P0LIST);
3401 } 3823 }
3402 else 3824
3403 s_return (SCHEME_V->value); 3825 s_return (SCHEME_V->value);
3404 3826
3405 case OP_EVAL: /* main part of evaluation */ 3827 case OP_EVAL: /* main part of evaluation */
3406#if USE_TRACING 3828#if USE_TRACING
3407 if (SCHEME_V->tracing) 3829 if (SCHEME_V->tracing)
3408 { 3830 {
… …
3419#endif 3841#endif
3420 if (is_symbol (SCHEME_V->code)) /* symbol */ 3842 if (is_symbol (SCHEME_V->code)) /* symbol */
3421 { 3843 {
3422 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3844 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3423 3845
3424 if (x != NIL) 3846 if (x == NIL)
3425 s_return (slot_value_in_env (x));
3426 else
3427 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3847 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3848
3849 s_return (slot_value_in_env (x));
3428 } 3850 }
3429 else if (is_pair (SCHEME_V->code)) 3851 else if (is_pair (SCHEME_V->code))
3430 { 3852 {
3431 x = car (SCHEME_V->code); 3853 x = car (SCHEME_V->code);
3432 3854
… …
3441 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3863 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3442 SCHEME_V->code = x; 3864 SCHEME_V->code = x;
3443 s_goto (OP_EVAL); 3865 s_goto (OP_EVAL);
3444 } 3866 }
3445 } 3867 }
3446 else 3868
3447 s_return (SCHEME_V->code); 3869 s_return (SCHEME_V->code);
3448 3870
3449 case OP_E0ARGS: /* eval arguments */ 3871 case OP_E0ARGS: /* eval arguments */
3450 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */ 3872 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3451 { 3873 {
3452 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3874 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3453 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3875 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3454 SCHEME_V->code = SCHEME_V->value; 3876 SCHEME_V->code = SCHEME_V->value;
3455 s_goto (OP_APPLY); 3877 s_goto (OP_APPLY);
3456 } 3878 }
3457 else 3879
3458 {
3459 SCHEME_V->code = cdr (SCHEME_V->code); 3880 SCHEME_V->code = cdr (SCHEME_V->code);
3460 s_goto (OP_E1ARGS); 3881 s_goto (OP_E1ARGS);
3461 }
3462 3882
3463 case OP_E1ARGS: /* eval arguments */ 3883 case OP_E1ARGS: /* eval arguments */
3464 args = cons (SCHEME_V->value, args); 3884 args = cons (SCHEME_V->value, args);
3465 3885
3466 if (is_pair (SCHEME_V->code)) /* continue */ 3886 if (is_pair (SCHEME_V->code)) /* continue */
… …
3477 SCHEME_V->args = cdr (args); 3897 SCHEME_V->args = cdr (args);
3478 s_goto (OP_APPLY); 3898 s_goto (OP_APPLY);
3479 } 3899 }
3480 3900
3481#if USE_TRACING 3901#if USE_TRACING
3482
3483 case OP_TRACING: 3902 case OP_TRACING:
3484 { 3903 {
3485 int tr = SCHEME_V->tracing; 3904 int tr = SCHEME_V->tracing;
3486 3905
3487 SCHEME_V->tracing = ivalue_unchecked (car (args)); 3906 SCHEME_V->tracing = ivalue_unchecked (car (args));
3488 s_return (mk_integer (SCHEME_A_ tr)); 3907 s_return (mk_integer (SCHEME_A_ tr));
3489 } 3908 }
3490
3491#endif 3909#endif
3492 3910
3493 case OP_APPLY: /* apply 'code' to 'args' */ 3911 case OP_APPLY: /* apply 'code' to 'args' */
3494#if USE_TRACING 3912#if USE_TRACING
3495 if (SCHEME_V->tracing) 3913 if (SCHEME_V->tracing)
… …
3509 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3927 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3510 else if (is_foreign (SCHEME_V->code)) 3928 else if (is_foreign (SCHEME_V->code))
3511 { 3929 {
3512 /* Keep nested calls from GC'ing the arglist */ 3930 /* Keep nested calls from GC'ing the arglist */
3513 push_recent_alloc (SCHEME_A_ args, NIL); 3931 push_recent_alloc (SCHEME_A_ args, NIL);
3514 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3932 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3515 3933
3516 s_return (x); 3934 s_return (x);
3517 } 3935 }
3518 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3936 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3519 { 3937 {
… …
3549 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3967 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3550 { 3968 {
3551 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3969 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3552 s_return (args != NIL ? car (args) : NIL); 3970 s_return (args != NIL ? car (args) : NIL);
3553 } 3971 }
3554 else 3972
3555 Error_0 ("illegal function"); 3973 Error_0 ("illegal function");
3556 3974
3557 case OP_DOMACRO: /* do macro */ 3975 case OP_DOMACRO: /* do macro */
3558 SCHEME_V->code = SCHEME_V->value; 3976 SCHEME_V->code = SCHEME_V->value;
3559 s_goto (OP_EVAL); 3977 s_goto (OP_EVAL);
3560
3561#if 1
3562 3978
3563 case OP_LAMBDA: /* lambda */ 3979 case OP_LAMBDA: /* lambda */
3564 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3980 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3565 set SCHEME_V->value fall thru */ 3981 set SCHEME_V->value fall thru */
3566 { 3982 {
… …
3573 SCHEME_V->code = slot_value_in_env (f); 3989 SCHEME_V->code = slot_value_in_env (f);
3574 s_goto (OP_APPLY); 3990 s_goto (OP_APPLY);
3575 } 3991 }
3576 3992
3577 SCHEME_V->value = SCHEME_V->code; 3993 SCHEME_V->value = SCHEME_V->code;
3578 /* Fallthru */
3579 } 3994 }
3995 /* Fallthru */
3580 3996
3581 case OP_LAMBDA1: 3997 case OP_LAMBDA1:
3582 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3998 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3583
3584#else
3585
3586 case OP_LAMBDA: /* lambda */
3587 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3588
3589#endif
3590 3999
3591 case OP_MKCLOSURE: /* make-closure */ 4000 case OP_MKCLOSURE: /* make-closure */
3592 x = car (args); 4001 x = car (args);
3593 4002
3594 if (car (x) == SCHEME_V->LAMBDA) 4003 if (car (x) == SCHEME_V->LAMBDA)
… …
3633 else 4042 else
3634 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 4043 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3635 4044
3636 s_return (SCHEME_V->code); 4045 s_return (SCHEME_V->code);
3637 4046
3638
3639 case OP_DEFP: /* defined? */ 4047 case OP_DEFP: /* defined? */
3640 x = SCHEME_V->envir; 4048 x = SCHEME_V->envir;
3641 4049
3642 if (cdr (args) != NIL) 4050 if (cdr (args) != NIL)
3643 x = cadr (args); 4051 x = cadr (args);
… …
3661 s_return (SCHEME_V->value); 4069 s_return (SCHEME_V->value);
3662 } 4070 }
3663 else 4071 else
3664 Error_1 ("set!: unbound variable:", SCHEME_V->code); 4072 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3665 4073
3666
3667 case OP_BEGIN: /* begin */ 4074 case OP_BEGIN: /* begin */
3668 if (!is_pair (SCHEME_V->code)) 4075 if (!is_pair (SCHEME_V->code))
3669 s_return (SCHEME_V->code); 4076 s_return (SCHEME_V->code);
3670 4077
3671 if (cdr (SCHEME_V->code) != NIL) 4078 if (cdr (SCHEME_V->code) != NIL)
… …
3682 case OP_IF1: /* if */ 4089 case OP_IF1: /* if */
3683 if (is_true (SCHEME_V->value)) 4090 if (is_true (SCHEME_V->value))
3684 SCHEME_V->code = car (SCHEME_V->code); 4091 SCHEME_V->code = car (SCHEME_V->code);
3685 else 4092 else
3686 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 4093 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
4094
3687 s_goto (OP_EVAL); 4095 s_goto (OP_EVAL);
3688 4096
3689 case OP_LET0: /* let */ 4097 case OP_LET0: /* let */
3690 SCHEME_V->args = NIL; 4098 SCHEME_V->args = NIL;
3691 SCHEME_V->value = SCHEME_V->code; 4099 SCHEME_V->value = SCHEME_V->code;
3692 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 4100 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3693 s_goto (OP_LET1); 4101 s_goto (OP_LET1);
3694 4102
3695 case OP_LET1: /* let (calculate parameters) */ 4103 case OP_LET1: /* let (calculate parameters) */
4104 case OP_LET1REC: /* letrec (calculate parameters) */
3696 args = cons (SCHEME_V->value, args); 4105 args = cons (SCHEME_V->value, args);
3697 4106
3698 if (is_pair (SCHEME_V->code)) /* continue */ 4107 if (is_pair (SCHEME_V->code)) /* continue */
3699 { 4108 {
3700 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 4109 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3701 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 4110 Error_1 ("Bad syntax of binding spec in let/letrec:", car (SCHEME_V->code));
3702 4111
3703 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4112 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3704 SCHEME_V->code = cadar (SCHEME_V->code); 4113 SCHEME_V->code = cadar (SCHEME_V->code);
3705 SCHEME_V->args = NIL; 4114 SCHEME_V->args = NIL;
3706 s_goto (OP_EVAL); 4115 s_goto (OP_EVAL);
3707 } 4116 }
3708 else /* end */ 4117
3709 { 4118 /* end */
3710 args = reverse_in_place (SCHEME_A_ NIL, args); 4119 args = reverse_in_place (SCHEME_A_ NIL, args);
3711 SCHEME_V->code = car (args); 4120 SCHEME_V->code = car (args);
3712 SCHEME_V->args = cdr (args); 4121 SCHEME_V->args = cdr (args);
3713 s_goto (OP_LET2); 4122 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3714 }
3715 4123
3716 case OP_LET2: /* let */ 4124 case OP_LET2: /* let */
3717 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4125 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3718 4126
3719 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args; 4127 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
… …
3723 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4131 if (is_symbol (car (SCHEME_V->code))) /* named let */
3724 { 4132 {
3725 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x)) 4133 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3726 { 4134 {
3727 if (!is_pair (x)) 4135 if (!is_pair (x))
3728 Error_1 ("Bad syntax of binding in let :", x); 4136 Error_1 ("Bad syntax of binding in let:", x);
3729 4137
3730 if (!is_list (SCHEME_A_ car (x))) 4138 if (!is_list (SCHEME_A_ car (x)))
3731 Error_1 ("Bad syntax of binding in let :", car (x)); 4139 Error_1 ("Bad syntax of binding in let:", car (x));
3732 4140
3733 args = cons (caar (x), args); 4141 args = cons (caar (x), args);
3734 } 4142 }
3735 4143
3736 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)), 4144 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
… …
3753 SCHEME_V->code = cdr (SCHEME_V->code); 4161 SCHEME_V->code = cdr (SCHEME_V->code);
3754 s_goto (OP_BEGIN); 4162 s_goto (OP_BEGIN);
3755 } 4163 }
3756 4164
3757 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code))) 4165 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code)))
3758 Error_1 ("Bad syntax of binding spec in let* :", car (SCHEME_V->code)); 4166 Error_1 ("Bad syntax of binding spec in let*:", car (SCHEME_V->code));
3759 4167
3760 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code)); 4168 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code));
3761 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4169 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3762 s_goto (OP_EVAL); 4170 s_goto (OP_EVAL);
3763 4171
… …
3774 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4182 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3775 SCHEME_V->code = cadar (SCHEME_V->code); 4183 SCHEME_V->code = cadar (SCHEME_V->code);
3776 SCHEME_V->args = NIL; 4184 SCHEME_V->args = NIL;
3777 s_goto (OP_EVAL); 4185 s_goto (OP_EVAL);
3778 } 4186 }
3779 else /* end */ 4187
4188 /* end */
3780 { 4189
3781 SCHEME_V->code = args; 4190 SCHEME_V->code = args;
3782 SCHEME_V->args = NIL; 4191 SCHEME_V->args = NIL;
3783 s_goto (OP_BEGIN); 4192 s_goto (OP_BEGIN);
3784 }
3785 4193
3786 case OP_LET0REC: /* letrec */ 4194 case OP_LET0REC: /* letrec */
3787 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4195 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3788 SCHEME_V->args = NIL; 4196 SCHEME_V->args = NIL;
3789 SCHEME_V->value = SCHEME_V->code; 4197 SCHEME_V->value = SCHEME_V->code;
3790 SCHEME_V->code = car (SCHEME_V->code); 4198 SCHEME_V->code = car (SCHEME_V->code);
3791 s_goto (OP_LET1REC); 4199 s_goto (OP_LET1REC);
3792 4200
3793 case OP_LET1REC: /* letrec (calculate parameters) */ 4201 /* OP_LET1REC handled by OP_LET1 */
3794 args = cons (SCHEME_V->value, args);
3795
3796 if (is_pair (SCHEME_V->code)) /* continue */
3797 {
3798 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3799 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3800
3801 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3802 SCHEME_V->code = cadar (SCHEME_V->code);
3803 SCHEME_V->args = NIL;
3804 s_goto (OP_EVAL);
3805 }
3806 else /* end */
3807 {
3808 args = reverse_in_place (SCHEME_A_ NIL, args);
3809 SCHEME_V->code = car (args);
3810 SCHEME_V->args = cdr (args);
3811 s_goto (OP_LET2REC);
3812 }
3813 4202
3814 case OP_LET2REC: /* letrec */ 4203 case OP_LET2REC: /* letrec */
3815 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y)) 4204 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3816 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4205 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3817 4206
… …
3847 } 4236 }
3848 else 4237 else
3849 { 4238 {
3850 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4239 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3851 s_return (NIL); 4240 s_return (NIL);
3852 else 4241
3853 {
3854 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4242 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3855 SCHEME_V->code = caar (SCHEME_V->code); 4243 SCHEME_V->code = caar (SCHEME_V->code);
3856 s_goto (OP_EVAL); 4244 s_goto (OP_EVAL);
3857 }
3858 } 4245 }
3859 4246
3860 case OP_DELAY: /* delay */ 4247 case OP_DELAY: /* delay */
3861 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 4248 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3862 set_typeflag (x, T_PROMISE); 4249 set_typeflag (x, T_PROMISE);
… …
3873 case OP_AND1: /* and */ 4260 case OP_AND1: /* and */
3874 if (is_false (SCHEME_V->value)) 4261 if (is_false (SCHEME_V->value))
3875 s_return (SCHEME_V->value); 4262 s_return (SCHEME_V->value);
3876 else if (SCHEME_V->code == NIL) 4263 else if (SCHEME_V->code == NIL)
3877 s_return (SCHEME_V->value); 4264 s_return (SCHEME_V->value);
3878 else 4265
3879 {
3880 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4266 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3881 SCHEME_V->code = car (SCHEME_V->code); 4267 SCHEME_V->code = car (SCHEME_V->code);
3882 s_goto (OP_EVAL); 4268 s_goto (OP_EVAL);
3883 }
3884 4269
3885 case OP_OR0: /* or */ 4270 case OP_OR0: /* or */
3886 if (SCHEME_V->code == NIL) 4271 if (SCHEME_V->code == NIL)
3887 s_return (S_F); 4272 s_return (S_F);
3888 4273
… …
3893 case OP_OR1: /* or */ 4278 case OP_OR1: /* or */
3894 if (is_true (SCHEME_V->value)) 4279 if (is_true (SCHEME_V->value))
3895 s_return (SCHEME_V->value); 4280 s_return (SCHEME_V->value);
3896 else if (SCHEME_V->code == NIL) 4281 else if (SCHEME_V->code == NIL)
3897 s_return (SCHEME_V->value); 4282 s_return (SCHEME_V->value);
3898 else 4283
3899 {
3900 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4284 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3901 SCHEME_V->code = car (SCHEME_V->code); 4285 SCHEME_V->code = car (SCHEME_V->code);
3902 s_goto (OP_EVAL); 4286 s_goto (OP_EVAL);
3903 }
3904 4287
3905 case OP_C0STREAM: /* cons-stream */ 4288 case OP_C0STREAM: /* cons-stream */
3906 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4289 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3907 SCHEME_V->code = car (SCHEME_V->code); 4290 SCHEME_V->code = car (SCHEME_V->code);
3908 s_goto (OP_EVAL); 4291 s_goto (OP_EVAL);
… …
3973 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4356 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3974 SCHEME_V->code = caar (x); 4357 SCHEME_V->code = caar (x);
3975 s_goto (OP_EVAL); 4358 s_goto (OP_EVAL);
3976 } 4359 }
3977 } 4360 }
3978 else 4361
3979 s_return (NIL); 4362 s_return (NIL);
3980 4363
3981 case OP_CASE2: /* case */ 4364 case OP_CASE2: /* case */
3982 if (is_true (SCHEME_V->value)) 4365 if (is_true (SCHEME_V->value))
3983 s_goto (OP_BEGIN); 4366 s_goto (OP_BEGIN);
3984 else 4367
3985 s_return (NIL); 4368 s_return (NIL);
3986 4369
3987 case OP_PAPPLY: /* apply */ 4370 case OP_PAPPLY: /* apply */
3988 SCHEME_V->code = car (args); 4371 SCHEME_V->code = car (args);
3989 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4372 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3990 /*SCHEME_V->args = cadr(args); */ 4373 /*SCHEME_V->args = cadr(args); */
… …
4004 } 4387 }
4005 4388
4006 if (USE_ERROR_CHECKING) abort (); 4389 if (USE_ERROR_CHECKING) abort ();
4007} 4390}
4008 4391
4009static int 4392/* math, cxr */
4393ecb_hot static int
4010opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4394opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4011{ 4395{
4012 pointer args = SCHEME_V->args; 4396 pointer args = SCHEME_V->args;
4013 pointer x = car (args); 4397 pointer x = car (args);
4014 num v; 4398 num v;
4015 4399
4016 switch (op) 4400 switch (op)
4017 { 4401 {
4018#if USE_MATH 4402#if USE_MATH
4019 case OP_INEX2EX: /* inexact->exact */ 4403 case OP_INEX2EX: /* inexact->exact */
4020 {
4021 if (is_integer (x)) 4404 if (!is_integer (x))
4022 s_return (x); 4405 {
4023
4024 RVALUE r = rvalue_unchecked (x); 4406 RVALUE r = rvalue_unchecked (x);
4025 4407
4026 if (r == (RVALUE)(IVALUE)r) 4408 if (r == (RVALUE)(IVALUE)r)
4027 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4409 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
4028 else 4410 else
4029 Error_1 ("inexact->exact: not integral:", x); 4411 Error_1 ("inexact->exact: not integral:", x);
4030 } 4412 }
4031 4413
4414 s_return (x);
4415
4416 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4417 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4418 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4419 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4420
4421 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4032 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4422 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4033 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4423 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4424 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
4034 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4425 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4035 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4426 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4036 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4427 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4037 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4428 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4038 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4429 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4039 4430
4040 case OP_ATAN: 4431 case OP_ATAN:
4432 s_return (mk_real (SCHEME_A_
4041 if (cdr (args) == NIL) 4433 cdr (args) == NIL
4042 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4434 ? atan (rvalue (x))
4043 else 4435 : atan2 (rvalue (x), rvalue (cadr (args)))));
4044 {
4045 pointer y = cadr (args);
4046 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4047 }
4048
4049 case OP_SQRT:
4050 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4051 4436
4052 case OP_EXPT: 4437 case OP_EXPT:
4053 { 4438 {
4054 RVALUE result; 4439 RVALUE result;
4055 int real_result = 1; 4440 int real_result = 1;
… …
4078 if (real_result) 4463 if (real_result)
4079 s_return (mk_real (SCHEME_A_ result)); 4464 s_return (mk_real (SCHEME_A_ result));
4080 else 4465 else
4081 s_return (mk_integer (SCHEME_A_ result)); 4466 s_return (mk_integer (SCHEME_A_ result));
4082 } 4467 }
4083
4084 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4085 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4086
4087 case OP_TRUNCATE:
4088 {
4089 RVALUE n = rvalue (x);
4090 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4091 }
4092
4093 case OP_ROUND:
4094 if (is_integer (x))
4095 s_return (x);
4096
4097 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4098#endif 4468#endif
4099 4469
4100 case OP_ADD: /* + */ 4470 case OP_ADD: /* + */
4101 v = num_zero; 4471 v = num_zero;
4102 4472
… …
4190 else 4560 else
4191 Error_0 ("modulo: division by zero"); 4561 Error_0 ("modulo: division by zero");
4192 4562
4193 s_return (mk_number (SCHEME_A_ v)); 4563 s_return (mk_number (SCHEME_A_ v));
4194 4564
4195 case OP_CAR: /* car */ 4565 /* the compiler will optimize this mess... */
4196 s_return (caar (args)); 4566 case OP_CAR: op_car: s_return (car (x));
4197 4567 case OP_CDR: op_cdr: s_return (cdr (x));
4198 case OP_CDR: /* cdr */ 4568 case OP_CAAR: op_caar: x = car (x); goto op_car;
4199 s_return (cdar (args)); 4569 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4570 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4571 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4572 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4573 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4574 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4575 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4576 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4577 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4578 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4579 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4580 case OP_CAAAAR: x = car (x); goto op_caaar;
4581 case OP_CAAADR: x = cdr (x); goto op_caaar;
4582 case OP_CAADAR: x = car (x); goto op_caadr;
4583 case OP_CAADDR: x = cdr (x); goto op_caadr;
4584 case OP_CADAAR: x = car (x); goto op_cadar;
4585 case OP_CADADR: x = cdr (x); goto op_cadar;
4586 case OP_CADDAR: x = car (x); goto op_caddr;
4587 case OP_CADDDR: x = cdr (x); goto op_caddr;
4588 case OP_CDAAAR: x = car (x); goto op_cdaar;
4589 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4590 case OP_CDADAR: x = car (x); goto op_cdadr;
4591 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4592 case OP_CDDAAR: x = car (x); goto op_cddar;
4593 case OP_CDDADR: x = cdr (x); goto op_cddar;
4594 case OP_CDDDAR: x = car (x); goto op_cdddr;
4595 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4200 4596
4201 case OP_CONS: /* cons */ 4597 case OP_CONS: /* cons */
4202 set_cdr (args, cadr (args)); 4598 set_cdr (args, cadr (args));
4203 s_return (args); 4599 s_return (args);
4204 4600
… …
4378 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4774 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4379 4775
4380 s_return (newstr); 4776 s_return (newstr);
4381 } 4777 }
4382 4778
4383 case OP_SUBSTR: /* substring */ 4779 case OP_STRING_COPY: /* substring/string-copy */
4384 { 4780 {
4385 char *str = strvalue (x); 4781 char *str = strvalue (x);
4386 int index0 = ivalue_unchecked (cadr (args)); 4782 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4387 int index1; 4783 int index1;
4388 int len; 4784 int len;
4389 4785
4390 if (index0 > strlength (x)) 4786 if (index0 > strlength (x))
4391 Error_1 ("substring: start out of bounds:", cadr (args)); 4787 Error_1 ("string->copy: start out of bounds:", cadr (args));
4392 4788
4393 if (cddr (args) != NIL) 4789 if (cddr (args) != NIL)
4394 { 4790 {
4395 index1 = ivalue_unchecked (caddr (args)); 4791 index1 = ivalue_unchecked (caddr (args));
4396 4792
4397 if (index1 > strlength (x) || index1 < index0) 4793 if (index1 > strlength (x) || index1 < index0)
4398 Error_1 ("substring: end out of bounds:", caddr (args)); 4794 Error_1 ("string->copy: end out of bounds:", caddr (args));
4399 } 4795 }
4400 else 4796 else
4401 index1 = strlength (x); 4797 index1 = strlength (x);
4402 4798
4403 len = index1 - index0; 4799 len = index1 - index0;
4404 x = mk_empty_string (SCHEME_A_ len, ' '); 4800 x = mk_counted_string (SCHEME_A_ str + index0, len);
4405 memcpy (strvalue (x), str + index0, len);
4406 strvalue (x)[len] = 0;
4407 4801
4408 s_return (x); 4802 s_return (x);
4409 } 4803 }
4410 4804
4411 case OP_VECTOR: /* vector */ 4805 case OP_VECTOR: /* vector */
… …
4485 } 4879 }
4486 4880
4487 if (USE_ERROR_CHECKING) abort (); 4881 if (USE_ERROR_CHECKING) abort ();
4488} 4882}
4489 4883
4490static int 4884/* relational ops */
4885ecb_hot static int
4491opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4886opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4492{ 4887{
4493 pointer x = SCHEME_V->args; 4888 pointer x = SCHEME_V->args;
4494 4889
4495 for (;;) 4890 for (;;)
… …
4516 } 4911 }
4517 4912
4518 s_return (S_T); 4913 s_return (S_T);
4519} 4914}
4520 4915
4521static int 4916/* predicates */
4917ecb_hot static int
4522opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4918opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4523{ 4919{
4524 pointer args = SCHEME_V->args; 4920 pointer args = SCHEME_V->args;
4525 pointer a = car (args); 4921 pointer a = car (args);
4526 pointer d = cdr (args); 4922 pointer d = cdr (args);
4527 int r; 4923 int r;
4528 4924
4529 switch (op) 4925 switch (op)
4530 { 4926 {
4531 case OP_NOT: /* not */ r = is_false (a) ; break; 4927 case OP_NOT: /* not */ r = is_false (a) ; break;
4532 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4928 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4533 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4929 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4534 case OP_NULLP: /* null? */ r = a == NIL ; break; 4930 case OP_NULLP: /* null? */ r = a == NIL ; break;
4535 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4931 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4932 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4536 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4933 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4537 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4934 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4538 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4935 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4539 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4936 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4540 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4937 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4541 4938
4542#if USE_CHAR_CLASSIFIERS 4939#if USE_CHAR_CLASSIFIERS
4543 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4940 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4544 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4941 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4545 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4942 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
… …
4572 } 4969 }
4573 4970
4574 s_retbool (r); 4971 s_retbool (r);
4575} 4972}
4576 4973
4577static int 4974/* promises, list ops, ports */
4975ecb_hot static int
4578opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4976opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4579{ 4977{
4580 pointer args = SCHEME_V->args; 4978 pointer args = SCHEME_V->args;
4581 pointer a = car (args); 4979 pointer a = car (args);
4582 pointer x, y; 4980 pointer x, y;
… …
4595 } 4993 }
4596 else 4994 else
4597 s_return (SCHEME_V->code); 4995 s_return (SCHEME_V->code);
4598 4996
4599 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4997 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4600 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4998 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4601 s_return (SCHEME_V->value); 4999 s_return (SCHEME_V->value);
4602 5000
4603#if USE_PORTS 5001#if USE_PORTS
5002
5003 case OP_EOF_OBJECT: /* eof-object */
5004 s_return (S_EOF);
4604 5005
4605 case OP_WRITE: /* write */ 5006 case OP_WRITE: /* write */
4606 case OP_DISPLAY: /* display */ 5007 case OP_DISPLAY: /* display */
4607 case OP_WRITE_CHAR: /* write-char */ 5008 case OP_WRITE_CHAR: /* write-char */
4608 if (is_pair (cdr (SCHEME_V->args))) 5009 if (is_pair (cdr (SCHEME_V->args)))
… …
4622 else 5023 else
4623 SCHEME_V->print_flag = 0; 5024 SCHEME_V->print_flag = 0;
4624 5025
4625 s_goto (OP_P0LIST); 5026 s_goto (OP_P0LIST);
4626 5027
5028 //TODO: move to scheme
4627 case OP_NEWLINE: /* newline */ 5029 case OP_NEWLINE: /* newline */
4628 if (is_pair (args)) 5030 if (is_pair (args))
4629 { 5031 {
4630 if (a != SCHEME_V->outport) 5032 if (a != SCHEME_V->outport)
4631 { 5033 {
… …
4633 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 5035 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4634 SCHEME_V->outport = a; 5036 SCHEME_V->outport = a;
4635 } 5037 }
4636 } 5038 }
4637 5039
4638 putstr (SCHEME_A_ "\n"); 5040 putcharacter (SCHEME_A_ '\n');
4639 s_return (S_T); 5041 s_return (S_T);
4640#endif 5042#endif
4641 5043
4642 case OP_ERR0: /* error */ 5044 case OP_ERR0: /* error */
4643 SCHEME_V->retcode = -1; 5045 SCHEME_V->retcode = -1;
… …
4652 putstr (SCHEME_A_ strvalue (car (args))); 5054 putstr (SCHEME_A_ strvalue (car (args)));
4653 SCHEME_V->args = cdr (args); 5055 SCHEME_V->args = cdr (args);
4654 s_goto (OP_ERR1); 5056 s_goto (OP_ERR1);
4655 5057
4656 case OP_ERR1: /* error */ 5058 case OP_ERR1: /* error */
4657 putstr (SCHEME_A_ " "); 5059 putcharacter (SCHEME_A_ ' ');
4658 5060
4659 if (args != NIL) 5061 if (args != NIL)
4660 { 5062 {
4661 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 5063 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4662 SCHEME_V->args = a; 5064 SCHEME_V->args = a;
4663 SCHEME_V->print_flag = 1; 5065 SCHEME_V->print_flag = 1;
4664 s_goto (OP_P0LIST); 5066 s_goto (OP_P0LIST);
4665 } 5067 }
4666 else 5068 else
4667 { 5069 {
4668 putstr (SCHEME_A_ "\n"); 5070 putcharacter (SCHEME_A_ '\n');
4669 5071
4670 if (SCHEME_V->interactive_repl) 5072 if (SCHEME_V->interactive_repl)
4671 s_goto (OP_T0LVL); 5073 s_goto (OP_T0LVL);
4672 else 5074 else
4673 return -1; 5075 return -1;
… …
4750 SCHEME_V->gc_verbose = (a != S_F); 5152 SCHEME_V->gc_verbose = (a != S_F);
4751 s_retbool (was); 5153 s_retbool (was);
4752 } 5154 }
4753 5155
4754 case OP_NEWSEGMENT: /* new-segment */ 5156 case OP_NEWSEGMENT: /* new-segment */
5157#if 0
4755 if (!is_pair (args) || !is_number (a)) 5158 if (!is_pair (args) || !is_number (a))
4756 Error_0 ("new-segment: argument must be a number"); 5159 Error_0 ("new-segment: argument must be a number");
4757 5160#endif
4758 alloc_cellseg (SCHEME_A_ ivalue (a)); 5161 s_retbool (alloc_cellseg (SCHEME_A));
4759
4760 s_return (S_T);
4761 5162
4762 case OP_OBLIST: /* oblist */ 5163 case OP_OBLIST: /* oblist */
4763 s_return (oblist_all_symbols (SCHEME_A)); 5164 s_return (oblist_all_symbols (SCHEME_A));
4764 5165
4765#if USE_PORTS 5166#if USE_PORTS
… …
4835 s_return (p == NIL ? S_F : p); 5236 s_return (p == NIL ? S_F : p);
4836 } 5237 }
4837 5238
4838 case OP_GET_OUTSTRING: /* get-output-string */ 5239 case OP_GET_OUTSTRING: /* get-output-string */
4839 { 5240 {
4840 port *p; 5241 port *p = port (a);
4841 5242
4842 if ((p = a->object.port)->kind & port_string) 5243 if (p->kind & port_string)
4843 { 5244 {
4844 off_t size; 5245 off_t size;
4845 char *str; 5246 char *str;
4846 5247
4847 size = p->rep.string.curr - p->rep.string.start + 1; 5248 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4882 } 5283 }
4883 5284
4884 if (USE_ERROR_CHECKING) abort (); 5285 if (USE_ERROR_CHECKING) abort ();
4885} 5286}
4886 5287
4887static int 5288/* reading */
5289ecb_cold static int
4888opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5290opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4889{ 5291{
4890 pointer args = SCHEME_V->args; 5292 pointer args = SCHEME_V->args;
4891 pointer x; 5293 pointer x;
4892 5294
… …
4952 int res; 5354 int res;
4953 5355
4954 if (is_pair (args)) 5356 if (is_pair (args))
4955 p = car (args); 5357 p = car (args);
4956 5358
4957 res = p->object.port->kind & port_string; 5359 res = port (p)->kind & port_string;
4958 5360
4959 s_retbool (res); 5361 s_retbool (res);
4960 } 5362 }
4961 5363
4962 case OP_SET_INPORT: /* set-input-port */ 5364 case OP_SET_INPORT: /* set-input-port */
… …
4971 case OP_RDSEXPR: 5373 case OP_RDSEXPR:
4972 switch (SCHEME_V->tok) 5374 switch (SCHEME_V->tok)
4973 { 5375 {
4974 case TOK_EOF: 5376 case TOK_EOF:
4975 s_return (S_EOF); 5377 s_return (S_EOF);
4976 /* NOTREACHED */
4977 5378
4978 case TOK_VEC: 5379 case TOK_VEC:
4979 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5380 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
4980 /* fall through */ 5381 /* fall through */
4981 5382
… …
4984 5385
4985 if (SCHEME_V->tok == TOK_RPAREN) 5386 if (SCHEME_V->tok == TOK_RPAREN)
4986 s_return (NIL); 5387 s_return (NIL);
4987 else if (SCHEME_V->tok == TOK_DOT) 5388 else if (SCHEME_V->tok == TOK_DOT)
4988 Error_0 ("syntax error: illegal dot expression"); 5389 Error_0 ("syntax error: illegal dot expression");
4989 else 5390
4990 {
4991 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5391 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
4992 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5392 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
4993 s_goto (OP_RDSEXPR); 5393 s_goto (OP_RDSEXPR);
4994 }
4995 5394
4996 case TOK_QUOTE: 5395 case TOK_QUOTE:
4997 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5396 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
4998 SCHEME_V->tok = token (SCHEME_A); 5397 SCHEME_V->tok = token (SCHEME_A);
4999 s_goto (OP_RDSEXPR); 5398 s_goto (OP_RDSEXPR);
… …
5005 { 5404 {
5006 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5405 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
5007 SCHEME_V->tok = TOK_LPAREN; 5406 SCHEME_V->tok = TOK_LPAREN;
5008 s_goto (OP_RDSEXPR); 5407 s_goto (OP_RDSEXPR);
5009 } 5408 }
5010 else 5409
5011 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5410 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
5012
5013 s_goto (OP_RDSEXPR); 5411 s_goto (OP_RDSEXPR);
5014 5412
5015 case TOK_COMMA: 5413 case TOK_COMMA:
5016 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5414 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
5017 SCHEME_V->tok = token (SCHEME_A); 5415 SCHEME_V->tok = token (SCHEME_A);
… …
5028 case TOK_DOTATOM: 5426 case TOK_DOTATOM:
5029 SCHEME_V->strbuff[0] = '.'; 5427 SCHEME_V->strbuff[0] = '.';
5030 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS))); 5428 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5031 5429
5032 case TOK_STRATOM: 5430 case TOK_STRATOM:
5431 //TODO: haven't checked whether the garbage collector could interfere and free x
5432 gc (SCHEME_A_ NIL, NIL); //TODO: superheavyhanded
5033 x = readstrexp (SCHEME_A_ '|'); 5433 x = readstrexp (SCHEME_A_ '|');
5034 //TODO: haven't checked whether the garbage collector could interfere
5035 s_return (mk_atom (SCHEME_A_ strvalue (x))); 5434 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5036 5435
5037 case TOK_DQUOTE: 5436 case TOK_DQUOTE:
5038 x = readstrexp (SCHEME_A_ '"'); 5437 x = readstrexp (SCHEME_A_ '"');
5039 5438
… …
5047 { 5446 {
5048 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1); 5447 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1);
5049 5448
5050 if (f == NIL) 5449 if (f == NIL)
5051 Error_0 ("undefined sharp expression"); 5450 Error_0 ("undefined sharp expression");
5052 else 5451
5053 {
5054 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5452 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
5055 s_goto (OP_EVAL); 5453 s_goto (OP_EVAL);
5056 }
5057 } 5454 }
5058 5455
5059 case TOK_SHARP_CONST: 5456 case TOK_SHARP_CONST:
5060 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL) 5457 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5061 Error_0 ("undefined sharp expression"); 5458 Error_0 ("undefined sharp expression");
5062 else 5459
5063 s_return (x); 5460 s_return (x);
5064 5461
5065 default: 5462 default:
5066 Error_0 ("syntax error: illegal token"); 5463 Error_0 ("syntax error: illegal token");
5067 } 5464 }
5068 5465
… …
5161 pointer b = cdr (args); 5558 pointer b = cdr (args);
5162 int ok_abbr = ok_abbrev (b); 5559 int ok_abbr = ok_abbrev (b);
5163 SCHEME_V->args = car (b); 5560 SCHEME_V->args = car (b);
5164 5561
5165 if (a == SCHEME_V->QUOTE && ok_abbr) 5562 if (a == SCHEME_V->QUOTE && ok_abbr)
5166 putstr (SCHEME_A_ "'"); 5563 putcharacter (SCHEME_A_ '\'');
5167 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5564 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5168 putstr (SCHEME_A_ "`"); 5565 putcharacter (SCHEME_A_ '`');
5169 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5566 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5170 putstr (SCHEME_A_ ","); 5567 putcharacter (SCHEME_A_ ',');
5171 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5568 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5172 putstr (SCHEME_A_ ",@"); 5569 putstr (SCHEME_A_ ",@");
5173 else 5570 else
5174 { 5571 {
5175 putstr (SCHEME_A_ "("); 5572 putcharacter (SCHEME_A_ '(');
5176 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5573 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5177 SCHEME_V->args = a; 5574 SCHEME_V->args = a;
5178 } 5575 }
5179 5576
5180 s_goto (OP_P0LIST); 5577 s_goto (OP_P0LIST);
… …
5182 5579
5183 case OP_P1LIST: 5580 case OP_P1LIST:
5184 if (is_pair (args)) 5581 if (is_pair (args))
5185 { 5582 {
5186 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5583 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5187 putstr (SCHEME_A_ " "); 5584 putcharacter (SCHEME_A_ ' ');
5188 SCHEME_V->args = car (args); 5585 SCHEME_V->args = car (args);
5189 s_goto (OP_P0LIST); 5586 s_goto (OP_P0LIST);
5190 } 5587 }
5191 else if (is_vector (args)) 5588 else if (is_vector (args))
5192 { 5589 {
… …
5200 { 5597 {
5201 putstr (SCHEME_A_ " . "); 5598 putstr (SCHEME_A_ " . ");
5202 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5599 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5203 } 5600 }
5204 5601
5205 putstr (SCHEME_A_ ")"); 5602 putcharacter (SCHEME_A_ ')');
5206 s_return (S_T); 5603 s_return (S_T);
5207 } 5604 }
5208 5605
5209 case OP_PVECFROM: 5606 case OP_PVECFROM:
5210 { 5607 {
5211 int i = ivalue_unchecked (cdr (args)); 5608 IVALUE i = ivalue_unchecked (cdr (args));
5212 pointer vec = car (args); 5609 pointer vec = car (args);
5213 int len = veclength (vec); 5610 uint32_t len = veclength (vec);
5214 5611
5215 if (i == len) 5612 if (i == len)
5216 { 5613 {
5217 putstr (SCHEME_A_ ")"); 5614 putcharacter (SCHEME_A_ ')');
5218 s_return (S_T); 5615 s_return (S_T);
5219 } 5616 }
5220 else 5617 else
5221 { 5618 {
5222 pointer elem = vector_get (vec, i); 5619 pointer elem = vector_get (vec, i);
5223 5620
5224 ivalue_unchecked (cdr (args)) = i + 1; 5621 set_cdr (args, mk_integer (SCHEME_A_ i + 1));
5225 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5622 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5226 SCHEME_V->args = elem; 5623 SCHEME_V->args = elem;
5227 5624
5228 if (i > 0) 5625 if (i > 0)
5229 putstr (SCHEME_A_ " "); 5626 putcharacter (SCHEME_A_ ' ');
5230 5627
5231 s_goto (OP_P0LIST); 5628 s_goto (OP_P0LIST);
5232 } 5629 }
5233 } 5630 }
5234 } 5631 }
5235 5632
5236 if (USE_ERROR_CHECKING) abort (); 5633 if (USE_ERROR_CHECKING) abort ();
5237} 5634}
5238 5635
5239static int 5636/* list ops */
5637ecb_hot static int
5240opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5638opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5241{ 5639{
5242 pointer args = SCHEME_V->args; 5640 pointer args = SCHEME_V->args;
5243 pointer a = car (args); 5641 pointer a = car (args);
5244 pointer x, y; 5642 pointer x, y;
… …
5267 break; 5665 break;
5268 } 5666 }
5269 5667
5270 if (is_pair (y)) 5668 if (is_pair (y))
5271 s_return (car (y)); 5669 s_return (car (y));
5272 else 5670
5273 s_return (S_F); 5671 s_return (S_F);
5274
5275 5672
5276 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5673 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5277 SCHEME_V->args = a; 5674 SCHEME_V->args = a;
5278 5675
5279 if (SCHEME_V->args == NIL) 5676 if (SCHEME_V->args == NIL)
5280 s_return (S_F); 5677 s_return (S_F);
5281 else if (is_closure (SCHEME_V->args)) 5678 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5282 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5679 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5283 else if (is_macro (SCHEME_V->args)) 5680
5284 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5285 else
5286 s_return (S_F); 5681 s_return (S_F);
5287 5682
5288 case OP_CLOSUREP: /* closure? */ 5683 case OP_CLOSUREP: /* closure? */
5289 /* 5684 /*
5290 * Note, macro object is also a closure. 5685 * Note, macro object is also a closure.
5291 * Therefore, (closure? <#MACRO>) ==> #t 5686 * Therefore, (closure? <#MACRO>) ==> #t
… …
5302 5697
5303/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5698/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5304typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5699typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5305 5700
5306typedef int (*test_predicate)(pointer); 5701typedef int (*test_predicate)(pointer);
5307static int 5702
5703ecb_hot static int
5308tst_any (pointer p) 5704tst_any (pointer p)
5309{ 5705{
5310 return 1; 5706 return 1;
5311} 5707}
5312 5708
5313static int 5709ecb_hot static int
5314tst_inonneg (pointer p) 5710tst_inonneg (pointer p)
5315{ 5711{
5316 return is_integer (p) && ivalue_unchecked (p) >= 0; 5712 return is_integer (p) && ivalue_unchecked (p) >= 0;
5317} 5713}
5318 5714
5319static int 5715ecb_hot static int
5320tst_is_list (SCHEME_P_ pointer p) 5716tst_is_list (SCHEME_P_ pointer p)
5321{ 5717{
5322 return p == NIL || is_pair (p); 5718 return p == NIL || is_pair (p);
5323} 5719}
5324 5720
… …
5367#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5763#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5368#include "opdefines.h" 5764#include "opdefines.h"
5369#undef OP_DEF 5765#undef OP_DEF
5370; 5766;
5371 5767
5372static const char * 5768ecb_cold static const char *
5373opname (int idx) 5769opname (int idx)
5374{ 5770{
5375 const char *name = opnames; 5771 const char *name = opnames;
5376 5772
5377 /* should do this at compile time, but would require external program, right? */ 5773 /* should do this at compile time, but would require external program, right? */
… …
5379 name += strlen (name) + 1; 5775 name += strlen (name) + 1;
5380 5776
5381 return *name ? name : "ILLEGAL"; 5777 return *name ? name : "ILLEGAL";
5382} 5778}
5383 5779
5384static const char * 5780ecb_cold static const char *
5385procname (pointer x) 5781procname (pointer x)
5386{ 5782{
5387 return opname (procnum (x)); 5783 return opname (procnum (x));
5388} 5784}
5389 5785
… …
5409#undef OP_DEF 5805#undef OP_DEF
5410 {0} 5806 {0}
5411}; 5807};
5412 5808
5413/* kernel of this interpreter */ 5809/* kernel of this interpreter */
5414static void ecb_hot 5810ecb_hot static void
5415Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5811Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5416{ 5812{
5417 SCHEME_V->op = op; 5813 SCHEME_V->op = op;
5418 5814
5419 for (;;) 5815 for (;;)
… …
5502 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5898 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5503 return; 5899 return;
5504 5900
5505 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5901 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5506 { 5902 {
5507 xwrstr ("No memory!\n"); 5903 putstr (SCHEME_A_ "No memory!\n");
5508 return; 5904 return;
5509 } 5905 }
5510 } 5906 }
5511} 5907}
5512 5908
5513/* ========== Initialization of internal keywords ========== */ 5909/* ========== Initialization of internal keywords ========== */
5514 5910
5515static void 5911ecb_cold static void
5516assign_syntax (SCHEME_P_ const char *name) 5912assign_syntax (SCHEME_P_ const char *name)
5517{ 5913{
5518 pointer x = oblist_add_by_name (SCHEME_A_ name); 5914 pointer x = oblist_add_by_name (SCHEME_A_ name);
5519 set_typeflag (x, typeflag (x) | T_SYNTAX); 5915 set_typeflag (x, typeflag (x) | T_SYNTAX);
5520} 5916}
5521 5917
5522static void 5918ecb_cold static void
5523assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5919assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5524{ 5920{
5525 pointer x = mk_symbol (SCHEME_A_ name); 5921 pointer x = mk_symbol (SCHEME_A_ name);
5526 pointer y = mk_proc (SCHEME_A_ op); 5922 pointer y = mk_proc (SCHEME_A_ op);
5527 new_slot_in_env (SCHEME_A_ x, y); 5923 new_slot_in_env (SCHEME_A_ x, y);
… …
5530static pointer 5926static pointer
5531mk_proc (SCHEME_P_ enum scheme_opcodes op) 5927mk_proc (SCHEME_P_ enum scheme_opcodes op)
5532{ 5928{
5533 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5929 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5534 set_typeflag (y, (T_PROC | T_ATOM)); 5930 set_typeflag (y, (T_PROC | T_ATOM));
5535 ivalue_unchecked (y) = op; 5931 set_ivalue (y, op);
5536 return y; 5932 return y;
5537} 5933}
5538 5934
5539/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5935/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5540static int 5936ecb_hot static int
5541syntaxnum (pointer p) 5937syntaxnum (pointer p)
5542{ 5938{
5543 const char *s = strvalue (p); 5939 const char *s = strvalue (p);
5544 5940
5545 switch (strlength (p)) 5941 switch (strlength (p))
… …
5624 6020
5625ecb_cold int 6021ecb_cold int
5626scheme_init (SCHEME_P) 6022scheme_init (SCHEME_P)
5627{ 6023{
5628 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 6024 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5629 pointer x; 6025
6026 /* this memset is not strictly correct, as we assume (intcache)
6027 * that memset 0 will also set pointers to 0, but memset does
6028 * of course not guarantee that. screw such systems.
6029 */
6030 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5630 6031
5631 num_set_fixnum (num_zero, 1); 6032 num_set_fixnum (num_zero, 1);
5632 num_set_ivalue (num_zero, 0); 6033 num_set_ivalue (num_zero, 0);
5633 num_set_fixnum (num_one, 1); 6034 num_set_fixnum (num_one, 1);
5634 num_set_ivalue (num_one, 1); 6035 num_set_ivalue (num_one, 1);
… …
5646 SCHEME_V->save_inport = NIL; 6047 SCHEME_V->save_inport = NIL;
5647 SCHEME_V->loadport = NIL; 6048 SCHEME_V->loadport = NIL;
5648 SCHEME_V->nesting = 0; 6049 SCHEME_V->nesting = 0;
5649 SCHEME_V->interactive_repl = 0; 6050 SCHEME_V->interactive_repl = 0;
5650 6051
5651 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 6052 if (!alloc_cellseg (SCHEME_A))
5652 { 6053 {
5653#if USE_ERROR_CHECKING 6054#if USE_ERROR_CHECKING
5654 SCHEME_V->no_memory = 1; 6055 SCHEME_V->no_memory = 1;
5655 return 0; 6056 return 0;
5656#endif 6057#endif
5657 } 6058 }
5658 6059
5659 SCHEME_V->gc_verbose = 0; 6060 SCHEME_V->gc_verbose = 0;
5660 dump_stack_initialize (SCHEME_A); 6061 dump_stack_initialize (SCHEME_A);
5661 SCHEME_V->code = NIL; 6062 SCHEME_V->code = NIL;
5662 SCHEME_V->args = NIL; 6063 SCHEME_V->args = NIL;
5663 SCHEME_V->envir = NIL; 6064 SCHEME_V->envir = NIL;
6065 SCHEME_V->value = NIL;
5664 SCHEME_V->tracing = 0; 6066 SCHEME_V->tracing = 0;
5665 6067
5666 /* init NIL */ 6068 /* init NIL */
5667 set_typeflag (NIL, T_ATOM | T_MARK); 6069 set_typeflag (NIL, T_SPECIAL | T_ATOM);
5668 set_car (NIL, NIL); 6070 set_car (NIL, NIL);
5669 set_cdr (NIL, NIL); 6071 set_cdr (NIL, NIL);
5670 /* init T */ 6072 /* init T */
5671 set_typeflag (S_T, T_ATOM | T_MARK); 6073 set_typeflag (S_T, T_SPECIAL | T_ATOM);
5672 set_car (S_T, S_T); 6074 set_car (S_T, S_T);
5673 set_cdr (S_T, S_T); 6075 set_cdr (S_T, S_T);
5674 /* init F */ 6076 /* init F */
5675 set_typeflag (S_F, T_ATOM | T_MARK); 6077 set_typeflag (S_F, T_SPECIAL | T_ATOM);
5676 set_car (S_F, S_F); 6078 set_car (S_F, S_F);
5677 set_cdr (S_F, S_F); 6079 set_cdr (S_F, S_F);
5678 /* init EOF_OBJ */ 6080 /* init EOF_OBJ */
5679 set_typeflag (S_EOF, T_ATOM | T_MARK); 6081 set_typeflag (S_EOF, T_SPECIAL | T_ATOM);
5680 set_car (S_EOF, S_EOF); 6082 set_car (S_EOF, S_EOF);
5681 set_cdr (S_EOF, S_EOF); 6083 set_cdr (S_EOF, S_EOF);
5682 /* init sink */ 6084 /* init sink */
5683 set_typeflag (S_SINK, T_PAIR | T_MARK); 6085 set_typeflag (S_SINK, T_PAIR);
5684 set_car (S_SINK, NIL); 6086 set_car (S_SINK, NIL);
5685 6087
5686 /* init c_nest */ 6088 /* init c_nest */
5687 SCHEME_V->c_nest = NIL; 6089 SCHEME_V->c_nest = NIL;
5688 6090
5689 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 6091 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5690 /* init global_env */ 6092 /* init global_env */
5691 new_frame_in_env (SCHEME_A_ NIL); 6093 new_frame_in_env (SCHEME_A_ NIL);
5692 SCHEME_V->global_env = SCHEME_V->envir; 6094 SCHEME_V->global_env = SCHEME_V->envir;
5693 /* init else */ 6095 /* init else */
5694 x = mk_symbol (SCHEME_A_ "else"); 6096 new_slot_in_env (SCHEME_A_ mk_symbol (SCHEME_A_ "else"), S_T);
5695 new_slot_in_env (SCHEME_A_ x, S_T);
5696 6097
5697 { 6098 {
5698 static const char *syntax_names[] = { 6099 static const char *syntax_names[] = {
5699 "lambda", "quote", "define", "if", "begin", "set!", 6100 "lambda", "quote", "define", "if", "begin", "set!",
5700 "let", "let*", "letrec", "cond", "delay", "and", 6101 "let", "let*", "letrec", "cond", "delay", "and",
… …
5724 6125
5725 return !SCHEME_V->no_memory; 6126 return !SCHEME_V->no_memory;
5726} 6127}
5727 6128
5728#if USE_PORTS 6129#if USE_PORTS
5729void 6130ecb_cold void
5730scheme_set_input_port_file (SCHEME_P_ int fin) 6131scheme_set_input_port_file (SCHEME_P_ int fin)
5731{ 6132{
5732 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6133 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5733} 6134}
5734 6135
5735void 6136ecb_cold void
5736scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 6137scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5737{ 6138{
5738 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 6139 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5739} 6140}
5740 6141
5741void 6142ecb_cold void
5742scheme_set_output_port_file (SCHEME_P_ int fout) 6143scheme_set_output_port_file (SCHEME_P_ int fout)
5743{ 6144{
5744 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6145 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5745} 6146}
5746 6147
5747void 6148ecb_cold void
5748scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 6149scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5749{ 6150{
5750 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 6151 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5751} 6152}
5752#endif 6153#endif
5753 6154
5754void 6155ecb_cold void
5755scheme_set_external_data (SCHEME_P_ void *p) 6156scheme_set_external_data (SCHEME_P_ void *p)
5756{ 6157{
5757 SCHEME_V->ext_data = p; 6158 SCHEME_V->ext_data = p;
5758} 6159}
5759 6160
… …
5791 SCHEME_V->loadport = NIL; 6192 SCHEME_V->loadport = NIL;
5792 SCHEME_V->gc_verbose = 0; 6193 SCHEME_V->gc_verbose = 0;
5793 gc (SCHEME_A_ NIL, NIL); 6194 gc (SCHEME_A_ NIL, NIL);
5794 6195
5795 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6196 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5796 free (SCHEME_V->alloc_seg[i]); 6197 free (SCHEME_V->cell_seg[i]);
5797 6198
5798#if SHOW_ERROR_LINE 6199#if SHOW_ERROR_LINE
5799 for (i = 0; i <= SCHEME_V->file_i; i++) 6200 for (i = 0; i <= SCHEME_V->file_i; i++)
5800 {
5801 if (SCHEME_V->load_stack[i].kind & port_file) 6201 if (SCHEME_V->load_stack[i].kind & port_file)
5802 { 6202 {
5803 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6203 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5804 6204
5805 if (fname) 6205 if (fname)
5806 free (fname); 6206 free (fname);
5807 } 6207 }
5808 }
5809#endif 6208#endif
5810} 6209}
5811 6210
5812void 6211ecb_cold void
5813scheme_load_file (SCHEME_P_ int fin) 6212scheme_load_file (SCHEME_P_ int fin)
5814{ 6213{
5815 scheme_load_named_file (SCHEME_A_ fin, 0); 6214 scheme_load_named_file (SCHEME_A_ fin, 0);
5816} 6215}
5817 6216
5818void 6217ecb_cold void
5819scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6218scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5820{ 6219{
5821 dump_stack_reset (SCHEME_A); 6220 dump_stack_reset (SCHEME_A);
5822 SCHEME_V->envir = SCHEME_V->global_env; 6221 SCHEME_V->envir = SCHEME_V->global_env;
5823 SCHEME_V->file_i = 0; 6222 SCHEME_V->file_i = 0;
5824 SCHEME_V->load_stack[0].unget = -1; 6223 SCHEME_V->load_stack[0].unget = -1;
5825 SCHEME_V->load_stack[0].kind = port_input | port_file; 6224 SCHEME_V->load_stack[0].kind = port_input | port_file;
5826 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6225 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5827#if USE_PORTS
5828 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6226 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5829#endif
5830 SCHEME_V->retcode = 0; 6227 SCHEME_V->retcode = 0;
5831 6228
5832#if USE_PORTS
5833 if (fin == STDIN_FILENO) 6229 if (fin == STDIN_FILENO)
5834 SCHEME_V->interactive_repl = 1; 6230 SCHEME_V->interactive_repl = 1;
5835#endif
5836 6231
5837#if USE_PORTS 6232#if USE_PORTS
5838#if SHOW_ERROR_LINE 6233#if SHOW_ERROR_LINE
5839 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6234 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5840 6235
… …
5844#endif 6239#endif
5845 6240
5846 SCHEME_V->inport = SCHEME_V->loadport; 6241 SCHEME_V->inport = SCHEME_V->loadport;
5847 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6242 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5848 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6243 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6244
5849 set_typeflag (SCHEME_V->loadport, T_ATOM); 6245 set_typeflag (SCHEME_V->loadport, T_ATOM);
5850 6246
5851 if (SCHEME_V->retcode == 0) 6247 if (SCHEME_V->retcode == 0)
5852 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6248 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5853} 6249}
5854 6250
5855void 6251ecb_cold void
5856scheme_load_string (SCHEME_P_ const char *cmd) 6252scheme_load_string (SCHEME_P_ const char *cmd)
5857{ 6253{
6254#if USE_PORTs
5858 dump_stack_reset (SCHEME_A); 6255 dump_stack_reset (SCHEME_A);
5859 SCHEME_V->envir = SCHEME_V->global_env; 6256 SCHEME_V->envir = SCHEME_V->global_env;
5860 SCHEME_V->file_i = 0; 6257 SCHEME_V->file_i = 0;
5861 SCHEME_V->load_stack[0].kind = port_input | port_string; 6258 SCHEME_V->load_stack[0].kind = port_input | port_string;
5862 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */ 6259 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5863 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd); 6260 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5864 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 6261 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5865#if USE_PORTS
5866 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6262 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5867#endif
5868 SCHEME_V->retcode = 0; 6263 SCHEME_V->retcode = 0;
5869 SCHEME_V->interactive_repl = 0; 6264 SCHEME_V->interactive_repl = 0;
5870 SCHEME_V->inport = SCHEME_V->loadport; 6265 SCHEME_V->inport = SCHEME_V->loadport;
5871 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6266 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5872 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6267 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5873 set_typeflag (SCHEME_V->loadport, T_ATOM); 6268 set_typeflag (SCHEME_V->loadport, T_ATOM);
5874 6269
5875 if (SCHEME_V->retcode == 0) 6270 if (SCHEME_V->retcode == 0)
5876 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6271 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6272#else
6273 abort ();
6274#endif
5877} 6275}
5878 6276
5879void 6277ecb_cold void
5880scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6278scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5881{ 6279{
5882 pointer x; 6280 pointer x;
5883 6281
5884 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6282 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5889 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6287 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5890} 6288}
5891 6289
5892#if !STANDALONE 6290#if !STANDALONE
5893 6291
5894void 6292ecb_cold void
5895scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6293scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5896{ 6294{
5897 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6295 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5898} 6296}
5899 6297
5900void 6298ecb_cold void
5901scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6299scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5902{ 6300{
5903 int i; 6301 int i;
5904 6302
5905 for (i = 0; i < count; i++) 6303 for (i = 0; i < count; i++)
5906 scheme_register_foreign_func (SCHEME_A_ list + i); 6304 scheme_register_foreign_func (SCHEME_A_ list + i);
5907} 6305}
5908 6306
5909pointer 6307ecb_cold pointer
5910scheme_apply0 (SCHEME_P_ const char *procname) 6308scheme_apply0 (SCHEME_P_ const char *procname)
5911{ 6309{
5912 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6310 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5913} 6311}
5914 6312
5915void 6313ecb_cold void
5916save_from_C_call (SCHEME_P) 6314save_from_C_call (SCHEME_P)
5917{ 6315{
5918 pointer saved_data = cons (car (S_SINK), 6316 pointer saved_data = cons (car (S_SINK),
5919 cons (SCHEME_V->envir, 6317 cons (SCHEME_V->envir,
5920 SCHEME_V->dump)); 6318 SCHEME_V->dump));
… …
5924 /* Truncate the dump stack so TS will return here when done, not 6322 /* Truncate the dump stack so TS will return here when done, not
5925 directly resume pre-C-call operations. */ 6323 directly resume pre-C-call operations. */
5926 dump_stack_reset (SCHEME_A); 6324 dump_stack_reset (SCHEME_A);
5927} 6325}
5928 6326
5929void 6327ecb_cold void
5930restore_from_C_call (SCHEME_P) 6328restore_from_C_call (SCHEME_P)
5931{ 6329{
5932 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6330 set_car (S_SINK, caar (SCHEME_V->c_nest));
5933 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6331 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5934 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6332 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5935 /* Pop */ 6333 /* Pop */
5936 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6334 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5937} 6335}
5938 6336
5939/* "func" and "args" are assumed to be already eval'ed. */ 6337/* "func" and "args" are assumed to be already eval'ed. */
5940pointer 6338ecb_cold pointer
5941scheme_call (SCHEME_P_ pointer func, pointer args) 6339scheme_call (SCHEME_P_ pointer func, pointer args)
5942{ 6340{
5943 int old_repl = SCHEME_V->interactive_repl; 6341 int old_repl = SCHEME_V->interactive_repl;
5944 6342
5945 SCHEME_V->interactive_repl = 0; 6343 SCHEME_V->interactive_repl = 0;
… …
5952 SCHEME_V->interactive_repl = old_repl; 6350 SCHEME_V->interactive_repl = old_repl;
5953 restore_from_C_call (SCHEME_A); 6351 restore_from_C_call (SCHEME_A);
5954 return SCHEME_V->value; 6352 return SCHEME_V->value;
5955} 6353}
5956 6354
5957pointer 6355ecb_cold pointer
5958scheme_eval (SCHEME_P_ pointer obj) 6356scheme_eval (SCHEME_P_ pointer obj)
5959{ 6357{
5960 int old_repl = SCHEME_V->interactive_repl; 6358 int old_repl = SCHEME_V->interactive_repl;
5961 6359
5962 SCHEME_V->interactive_repl = 0; 6360 SCHEME_V->interactive_repl = 0;
… …
5974 6372
5975/* ========== Main ========== */ 6373/* ========== Main ========== */
5976 6374
5977#if STANDALONE 6375#if STANDALONE
5978 6376
5979int 6377ecb_cold int
5980main (int argc, char **argv) 6378main (int argc, char **argv)
5981{ 6379{
5982# if USE_MULTIPLICITY 6380# if USE_MULTIPLICITY
5983 scheme ssc; 6381 scheme ssc;
5984 scheme *const SCHEME_V = &ssc; 6382 scheme *const SCHEME_V = &ssc;
… …
5986# endif 6384# endif
5987 int fin; 6385 int fin;
5988 char *file_name = InitFile; 6386 char *file_name = InitFile;
5989 int retcode; 6387 int retcode;
5990 int isfile = 1; 6388 int isfile = 1;
6389#if EXPERIMENT
5991 system ("ps v $PPID");//D 6390 system ("ps v $PPID");
6391#endif
5992 6392
5993 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6393 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5994 { 6394 {
5995 xwrstr ("Usage: tinyscheme -?\n"); 6395 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5996 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6396 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5997 xwrstr ("followed by\n"); 6397 putstr (SCHEME_A_ "followed by\n");
5998 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6398 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5999 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6399 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6000 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6400 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6001 xwrstr ("Use - as filename for stdin.\n"); 6401 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6002 return 1; 6402 return 1;
6003 } 6403 }
6004 6404
6005 if (!scheme_init (SCHEME_A)) 6405 if (!scheme_init (SCHEME_A))
6006 { 6406 {
6007 xwrstr ("Could not initialize!\n"); 6407 putstr (SCHEME_A_ "Could not initialize!\n");
6008 return 2; 6408 return 2;
6009 } 6409 }
6010 6410
6011# if USE_PORTS 6411# if USE_PORTS
6012 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6412 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6025 } 6425 }
6026#endif 6426#endif
6027 6427
6028 do 6428 do
6029 { 6429 {
6030#if USE_PORTS
6031 if (strcmp (file_name, "-") == 0) 6430 if (strcmp (file_name, "-") == 0)
6032 fin = STDIN_FILENO; 6431 fin = STDIN_FILENO;
6033 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6432 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
6034 { 6433 {
6035 pointer args = NIL; 6434 pointer args = NIL;
… …
6053 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6452 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
6054 6453
6055 } 6454 }
6056 else 6455 else
6057 fin = open (file_name, O_RDONLY); 6456 fin = open (file_name, O_RDONLY);
6058#endif
6059 6457
6060 if (isfile && fin < 0) 6458 if (isfile && fin < 0)
6061 { 6459 {
6062 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6460 putstr (SCHEME_A_ "Could not open file ");
6461 putstr (SCHEME_A_ file_name);
6462 putcharacter (SCHEME_A_ '\n');
6063 } 6463 }
6064 else 6464 else
6065 { 6465 {
6066 if (isfile) 6466 if (isfile)
6067 scheme_load_named_file (SCHEME_A_ fin, file_name); 6467 scheme_load_named_file (SCHEME_A_ fin, file_name);
6068 else 6468 else
6069 scheme_load_string (SCHEME_A_ file_name); 6469 scheme_load_string (SCHEME_A_ file_name);
6070 6470
6071#if USE_PORTS
6072 if (!isfile || fin != STDIN_FILENO) 6471 if (!isfile || fin != STDIN_FILENO)
6073 { 6472 {
6074 if (SCHEME_V->retcode != 0) 6473 if (SCHEME_V->retcode != 0)
6075 { 6474 {
6076 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6475 putstr (SCHEME_A_ "Errors encountered reading ");
6476 putstr (SCHEME_A_ file_name);
6477 putcharacter (SCHEME_A_ '\n');
6077 } 6478 }
6078 6479
6079 if (isfile) 6480 if (isfile)
6080 close (fin); 6481 close (fin);
6081 } 6482 }
6082#endif
6083 } 6483 }
6084 6484
6085 file_name = *argv++; 6485 file_name = *argv++;
6086 } 6486 }
6087 while (file_name != 0); 6487 while (file_name != 0);

Diff Legend

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