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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.40 by root, Mon Nov 30 05:19:01 2015 UTC vs.
Revision 1.67 by root, Mon Dec 7 19:49:35 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
2280 { 2266 {
2281 c = inchar (SCHEME_A); 2267 c = inchar (SCHEME_A);
2268
2282#if SHOW_ERROR_LINE 2269#if SHOW_ERROR_LINE
2283 if (c == '\n') 2270 if (ecb_expect_false (c == '\n'))
2284 curr_line++; 2271 curr_line++;
2285#endif 2272#endif
2273
2274 if (ecb_expect_false (c == EOF))
2275 return c;
2286 } 2276 }
2287 while (is_one_of (WHITESPACE, c)); 2277 while (is_one_of (WHITESPACE, c));
2288 2278
2289 /* record it */ 2279 /* record it */
2290#if SHOW_ERROR_LINE 2280#if SHOW_ERROR_LINE
2291 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2281 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2292 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2282 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2293#endif 2283#endif
2294 2284
2295 if (c != EOF)
2296 {
2297 backchar (SCHEME_A_ c); 2285 backchar (SCHEME_A_ c);
2298 return 1; 2286 return 1;
2299 }
2300 else
2301 return EOF;
2302} 2287}
2303 2288
2304/* get token */ 2289/* get token */
2305static int 2290ecb_cold static int
2306token (SCHEME_P) 2291token (SCHEME_P)
2307{ 2292{
2308 int c = skipspace (SCHEME_A); 2293 int c = skipspace (SCHEME_A);
2309 2294
2310 if (c == EOF) 2295 if (c == EOF)
… …
2408} 2393}
2409 2394
2410/* ========== Routines for Printing ========== */ 2395/* ========== Routines for Printing ========== */
2411#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2396#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2412 2397
2413static void 2398ecb_cold static void
2414printslashstring (SCHEME_P_ char *p, int len) 2399printslashstring (SCHEME_P_ char *p, int len)
2415{ 2400{
2416 int i; 2401 int i;
2417 unsigned char *s = (unsigned char *) p; 2402 unsigned char *s = (unsigned char *) p;
2418 2403
… …
2474 2459
2475 putcharacter (SCHEME_A_ '"'); 2460 putcharacter (SCHEME_A_ '"');
2476} 2461}
2477 2462
2478/* print atoms */ 2463/* print atoms */
2479static void 2464ecb_cold static void
2480printatom (SCHEME_P_ pointer l, int f) 2465printatom (SCHEME_P_ pointer l, int f)
2481{ 2466{
2482 char *p; 2467 char *p;
2483 int len; 2468 int len;
2484 2469
2485 atom2str (SCHEME_A_ l, f, &p, &len); 2470 atom2str (SCHEME_A_ l, f, &p, &len);
2486 putchars (SCHEME_A_ p, len); 2471 putchars (SCHEME_A_ p, len);
2487} 2472}
2488 2473
2489/* Uses internal buffer unless string pointer is already available */ 2474/* Uses internal buffer unless string pointer is already available */
2490static void 2475ecb_cold static void
2491atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2476atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2492{ 2477{
2493 char *p; 2478 char *p;
2494 2479
2495 if (l == NIL) 2480 if (l == NIL)
… …
2628 } 2613 }
2629 else if (is_symbol (l)) 2614 else if (is_symbol (l))
2630 p = symname (l); 2615 p = symname (l);
2631 else if (is_proc (l)) 2616 else if (is_proc (l))
2632 { 2617 {
2618 p = (char *)procname (l); // ok with r7rs display, but not r7rs write
2619#if 0
2633#if USE_PRINTF 2620#if USE_PRINTF
2634 p = SCHEME_V->strbuff; 2621 p = SCHEME_V->strbuff;
2635 snprintf (p, STRBUFFSIZE, "#<%s PROCEDURE %ld>", procname (l), procnum (l)); 2622 snprintf (p, STRBUFFSIZE, " PROCEDURE %ld>", procname (l), procnum (l));
2636#else 2623#else
2637 p = "#<PROCEDURE>"; 2624 p = "#<PROCEDURE>";
2625#endif
2638#endif 2626#endif
2639 } 2627 }
2640 else if (is_macro (l)) 2628 else if (is_macro (l))
2641 p = "#<MACRO>"; 2629 p = "#<MACRO>";
2642 else if (is_closure (l)) 2630 else if (is_closure (l))
… …
2702 return car (d); 2690 return car (d);
2703 2691
2704 p = cons (car (d), cdr (d)); 2692 p = cons (car (d), cdr (d));
2705 q = p; 2693 q = p;
2706 2694
2707 while (cdr (cdr (p)) != NIL) 2695 while (cddr (p) != NIL)
2708 { 2696 {
2709 d = cons (car (p), cdr (p)); 2697 d = cons (car (p), cdr (p));
2710 2698
2711 if (cdr (cdr (p)) != NIL) 2699 if (cddr (p) != NIL)
2712 p = cdr (d); 2700 p = cdr (d);
2713 } 2701 }
2714 2702
2715 set_cdr (p, car (cdr (p))); 2703 set_cdr (p, cadr (p));
2716 return q; 2704 return q;
2717} 2705}
2718 2706
2719/* reverse list -- produce new list */ 2707/* reverse list -- produce new list */
2720static pointer 2708ecb_hot static pointer
2721reverse (SCHEME_P_ pointer a) 2709reverse (SCHEME_P_ pointer a)
2722{ 2710{
2723 /* a must be checked by gc */ 2711 /* a must be checked by gc */
2724 pointer p = NIL; 2712 pointer p = NIL;
2725 2713
… …
2728 2716
2729 return p; 2717 return p;
2730} 2718}
2731 2719
2732/* reverse list --- in-place */ 2720/* reverse list --- in-place */
2733static pointer 2721ecb_hot static pointer
2734reverse_in_place (SCHEME_P_ pointer term, pointer list) 2722reverse_in_place (SCHEME_P_ pointer term, pointer list)
2735{ 2723{
2736 pointer result = term; 2724 pointer result = term;
2737 pointer p = list; 2725 pointer p = list;
2738 2726
… …
2746 2734
2747 return result; 2735 return result;
2748} 2736}
2749 2737
2750/* append list -- produce new list (in reverse order) */ 2738/* append list -- produce new list (in reverse order) */
2751static pointer 2739ecb_hot static pointer
2752revappend (SCHEME_P_ pointer a, pointer b) 2740revappend (SCHEME_P_ pointer a, pointer b)
2753{ 2741{
2754 pointer result = a; 2742 pointer result = a;
2755 pointer p = b; 2743 pointer p = b;
2756 2744
… …
2765 2753
2766 return S_F; /* signal an error */ 2754 return S_F; /* signal an error */
2767} 2755}
2768 2756
2769/* equivalence of atoms */ 2757/* equivalence of atoms */
2770int 2758ecb_hot int
2771eqv (pointer a, pointer b) 2759eqv (pointer a, pointer b)
2772{ 2760{
2773 if (is_string (a)) 2761 if (is_string (a))
2774 { 2762 {
2775 if (is_string (b)) 2763 if (is_string (b))
… …
2869 } 2857 }
2870 else 2858 else
2871 set_car (env, immutable_cons (slot, car (env))); 2859 set_car (env, immutable_cons (slot, car (env)));
2872} 2860}
2873 2861
2874static pointer 2862ecb_hot static pointer
2875find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2863find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2876{ 2864{
2877 pointer x, y; 2865 pointer x, y;
2878 2866
2879 for (x = env; x != NIL; x = cdr (x)) 2867 for (x = env; x != NIL; x = cdr (x))
… …
2900 return NIL; 2888 return NIL;
2901} 2889}
2902 2890
2903#else /* USE_ALIST_ENV */ 2891#else /* USE_ALIST_ENV */
2904 2892
2905ecb_inline void 2893static void
2906new_frame_in_env (SCHEME_P_ pointer old_env) 2894new_frame_in_env (SCHEME_P_ pointer old_env)
2907{ 2895{
2908 SCHEME_V->envir = immutable_cons (NIL, old_env); 2896 SCHEME_V->envir = immutable_cons (NIL, old_env);
2909 setenvironment (SCHEME_V->envir); 2897 setenvironment (SCHEME_V->envir);
2910} 2898}
2911 2899
2912ecb_inline void 2900static void
2913new_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)
2914{ 2902{
2915 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2903 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2916} 2904}
2917 2905
2918static pointer 2906ecb_hot static pointer
2919find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2907find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2920{ 2908{
2921 pointer x, y; 2909 pointer x, y;
2922 2910
2923 for (x = env; x != NIL; x = cdr (x)) 2911 for (x = env; x != NIL; x = cdr (x))
… …
2937 return NIL; 2925 return NIL;
2938} 2926}
2939 2927
2940#endif /* USE_ALIST_ENV else */ 2928#endif /* USE_ALIST_ENV else */
2941 2929
2942ecb_inline void 2930static void
2943new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2931new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2944{ 2932{
2945 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2 2933 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2946 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);
2947} 2935}
2948 2936
2949ecb_inline void 2937static void
2950set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2938set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2951{ 2939{
2952 set_cdr (slot, value); 2940 set_cdr (slot, value);
2953} 2941}
2954 2942
2955ecb_inline pointer 2943static pointer
2956slot_value_in_env (pointer slot) 2944slot_value_in_env (pointer slot)
2957{ 2945{
2958 return cdr (slot); 2946 return cdr (slot);
2959} 2947}
2960 2948
2961/* ========== Evaluation Cycle ========== */ 2949/* ========== Evaluation Cycle ========== */
2962 2950
2963static int 2951ecb_cold static int
2964xError_1 (SCHEME_P_ const char *s, pointer a) 2952xError_1 (SCHEME_P_ const char *s, pointer a)
2965{ 2953{
2966#if USE_ERROR_HOOK
2967 pointer x;
2968 pointer hdl = SCHEME_V->ERROR_HOOK;
2969#endif
2970
2971#if USE_PRINTF 2954#if USE_PRINTF
2972#if SHOW_ERROR_LINE 2955#if SHOW_ERROR_LINE
2973 char sbuf[STRBUFFSIZE]; 2956 char sbuf[STRBUFFSIZE];
2974 2957
2975 /* make sure error is not in REPL */ 2958 /* make sure error is not in REPL */
… …
2990 } 2973 }
2991#endif 2974#endif
2992#endif 2975#endif
2993 2976
2994#if USE_ERROR_HOOK 2977#if USE_ERROR_HOOK
2995 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);
2996 2979
2997 if (x != NIL) 2980 if (x != NIL)
2998 { 2981 {
2999 pointer code = a 2982 pointer code = a
3000 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2983 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3044 pointer code; 3027 pointer code;
3045}; 3028};
3046 3029
3047# define STACK_GROWTH 3 3030# define STACK_GROWTH 3
3048 3031
3049static void 3032ecb_hot static void
3050s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3033s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3051{ 3034{
3052 int nframes = (uintptr_t)SCHEME_V->dump; 3035 int nframes = (uintptr_t)SCHEME_V->dump;
3053 struct dump_stack_frame *next_frame; 3036 struct dump_stack_frame *next_frame;
3054 3037
3055 /* enough room for the next frame? */ 3038 /* enough room for the next frame? */
3056 if (nframes >= SCHEME_V->dump_size) 3039 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3057 { 3040 {
3058 SCHEME_V->dump_size += STACK_GROWTH; 3041 SCHEME_V->dump_size += STACK_GROWTH;
3059 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);
3060 } 3043 }
3061 3044
… …
3067 next_frame->code = code; 3050 next_frame->code = code;
3068 3051
3069 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3052 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3070} 3053}
3071 3054
3072static int 3055static ecb_hot int
3073xs_return (SCHEME_P_ pointer a) 3056xs_return (SCHEME_P_ pointer a)
3074{ 3057{
3075 int nframes = (uintptr_t)SCHEME_V->dump; 3058 int nframes = (uintptr_t)SCHEME_V->dump;
3076 struct dump_stack_frame *frame; 3059 struct dump_stack_frame *frame;
3077 3060
… …
3088 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3071 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3089 3072
3090 return 0; 3073 return 0;
3091} 3074}
3092 3075
3093ecb_inline void 3076ecb_cold void
3094dump_stack_reset (SCHEME_P) 3077dump_stack_reset (SCHEME_P)
3095{ 3078{
3096 /* 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 */
3097 SCHEME_V->dump = (pointer)+0; 3080 SCHEME_V->dump = (pointer)+0;
3098} 3081}
3099 3082
3100ecb_inline void 3083ecb_cold void
3101dump_stack_initialize (SCHEME_P) 3084dump_stack_initialize (SCHEME_P)
3102{ 3085{
3103 SCHEME_V->dump_size = 0; 3086 SCHEME_V->dump_size = 0;
3104 SCHEME_V->dump_base = 0; 3087 SCHEME_V->dump_base = 0;
3105 dump_stack_reset (SCHEME_A); 3088 dump_stack_reset (SCHEME_A);
3106} 3089}
3107 3090
3108static void 3091ecb_cold static void
3109dump_stack_free (SCHEME_P) 3092dump_stack_free (SCHEME_P)
3110{ 3093{
3111 free (SCHEME_V->dump_base); 3094 free (SCHEME_V->dump_base);
3112 SCHEME_V->dump_base = 0; 3095 SCHEME_V->dump_base = 0;
3113 SCHEME_V->dump = (pointer)0; 3096 SCHEME_V->dump = (pointer)0;
3114 SCHEME_V->dump_size = 0; 3097 SCHEME_V->dump_size = 0;
3115} 3098}
3116 3099
3117static void 3100ecb_cold static void
3118dump_stack_mark (SCHEME_P) 3101dump_stack_mark (SCHEME_P)
3119{ 3102{
3120 int nframes = (uintptr_t)SCHEME_V->dump; 3103 int nframes = (uintptr_t)SCHEME_V->dump;
3121 int i; 3104 int i;
3122 3105
… …
3128 mark (frame->envir); 3111 mark (frame->envir);
3129 mark (frame->code); 3112 mark (frame->code);
3130 } 3113 }
3131} 3114}
3132 3115
3133static pointer 3116ecb_cold static pointer
3134ss_get_cont (SCHEME_P) 3117ss_get_cont (SCHEME_P)
3135{ 3118{
3136 int nframes = (uintptr_t)SCHEME_V->dump; 3119 int nframes = (uintptr_t)SCHEME_V->dump;
3137 int i; 3120 int i;
3138 3121
… …
3150 } 3133 }
3151 3134
3152 return cont; 3135 return cont;
3153} 3136}
3154 3137
3155static void 3138ecb_cold static void
3156ss_set_cont (SCHEME_P_ pointer cont) 3139ss_set_cont (SCHEME_P_ pointer cont)
3157{ 3140{
3158 int i = 0; 3141 int i = 0;
3159 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3142 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3160 3143
… …
3172 SCHEME_V->dump = (pointer)(uintptr_t)i; 3155 SCHEME_V->dump = (pointer)(uintptr_t)i;
3173} 3156}
3174 3157
3175#else 3158#else
3176 3159
3177ecb_inline void 3160ecb_cold void
3178dump_stack_reset (SCHEME_P) 3161dump_stack_reset (SCHEME_P)
3179{ 3162{
3180 SCHEME_V->dump = NIL; 3163 SCHEME_V->dump = NIL;
3181} 3164}
3182 3165
3183ecb_inline void 3166ecb_cold void
3184dump_stack_initialize (SCHEME_P) 3167dump_stack_initialize (SCHEME_P)
3185{ 3168{
3186 dump_stack_reset (SCHEME_A); 3169 dump_stack_reset (SCHEME_A);
3187} 3170}
3188 3171
3189static void 3172ecb_cold static void
3190dump_stack_free (SCHEME_P) 3173dump_stack_free (SCHEME_P)
3191{ 3174{
3192 SCHEME_V->dump = NIL; 3175 SCHEME_V->dump = NIL;
3193} 3176}
3194 3177
3195static int 3178ecb_hot static int
3196xs_return (SCHEME_P_ pointer a) 3179xs_return (SCHEME_P_ pointer a)
3197{ 3180{
3198 pointer dump = SCHEME_V->dump; 3181 pointer dump = SCHEME_V->dump;
3199 3182
3200 SCHEME_V->value = a; 3183 SCHEME_V->value = a;
… …
3210 SCHEME_V->dump = dump; 3193 SCHEME_V->dump = dump;
3211 3194
3212 return 0; 3195 return 0;
3213} 3196}
3214 3197
3215static void 3198ecb_hot static void
3216s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3199s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3217{ 3200{
3218 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3201 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3219 cons (args, 3202 cons (args,
3220 cons (SCHEME_V->envir, 3203 cons (SCHEME_V->envir,
3221 cons (code, 3204 cons (code,
3222 SCHEME_V->dump)))); 3205 SCHEME_V->dump))));
3223} 3206}
3224 3207
3225static void 3208ecb_cold static void
3226dump_stack_mark (SCHEME_P) 3209dump_stack_mark (SCHEME_P)
3227{ 3210{
3228 mark (SCHEME_V->dump); 3211 mark (SCHEME_V->dump);
3229} 3212}
3230 3213
3231static pointer 3214ecb_cold static pointer
3232ss_get_cont (SCHEME_P) 3215ss_get_cont (SCHEME_P)
3233{ 3216{
3234 return SCHEME_V->dump; 3217 return SCHEME_V->dump;
3235} 3218}
3236 3219
3237static void 3220ecb_cold static void
3238ss_set_cont (SCHEME_P_ pointer cont) 3221ss_set_cont (SCHEME_P_ pointer cont)
3239{ 3222{
3240 SCHEME_V->dump = cont; 3223 SCHEME_V->dump = cont;
3241} 3224}
3242 3225
3243#endif 3226#endif
3244 3227
3245#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3228#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3246 3229
3247#if 1 3230#if EXPERIMENT
3231
3248static int 3232static int
3249debug (SCHEME_P_ int indent, pointer x) 3233dtree (SCHEME_P_ int indent, pointer x)
3250{ 3234{
3251 int c; 3235 int c;
3252 3236
3253 if (is_syntax (x)) 3237 if (is_syntax (x))
3254 { 3238 {
… …
3272 printf ("%*sS<%s>\n", indent, "", symname (x)); 3256 printf ("%*sS<%s>\n", indent, "", symname (x));
3273 return 24+8; 3257 return 24+8;
3274 3258
3275 case T_CLOSURE: 3259 case T_CLOSURE:
3276 printf ("%*sS<%s>\n", indent, "", "closure"); 3260 printf ("%*sS<%s>\n", indent, "", "closure");
3277 debug (SCHEME_A_ indent + 3, cdr(x)); 3261 dtree (SCHEME_A_ indent + 3, cdr(x));
3278 return 32 + debug (SCHEME_A_ indent + 3, car (x)); 3262 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3279 3263
3280 case T_PAIR: 3264 case T_PAIR:
3281 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x)); 3265 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3282 c = debug (SCHEME_A_ indent + 3, car (x)); 3266 c = dtree (SCHEME_A_ indent + 3, car (x));
3283 c += debug (SCHEME_A_ indent + 3, cdr (x)); 3267 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3284 return c + 1; 3268 return c + 1;
3285 3269
3286 case T_PORT: 3270 case T_PORT:
3287 printf ("%*sS<%s>\n", indent, "", "port"); 3271 printf ("%*sS<%s>\n", indent, "", "port");
3288 return 24+8; 3272 return 24+8;
… …
3291 printf ("%*sS<%s>\n", indent, "", "vector"); 3275 printf ("%*sS<%s>\n", indent, "", "vector");
3292 return 24+8; 3276 return 24+8;
3293 3277
3294 case T_ENVIRONMENT: 3278 case T_ENVIRONMENT:
3295 printf ("%*sS<%s>\n", indent, "", "environment"); 3279 printf ("%*sS<%s>\n", indent, "", "environment");
3296 return 0 + debug (SCHEME_A_ indent + 3, car (x)); 3280 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3297 3281
3298 default: 3282 default:
3299 printf ("unhandled type %d\n", type (x)); 3283 printf ("unhandled type %d\n", type (x));
3300 break; 3284 break;
3301 } 3285 }
3302} 3286}
3303#endif
3304 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_OP,
3400};
3401
3402ecb_cold static void compile_expr (SCHEME_P_ stream s, pointer x);
3403
3404ecb_cold static void
3405compile_list (SCHEME_P_ stream s, pointer x)
3406{
3407 // TODO: improper list
3408
3409 for (; x != NIL; x = cdr (x))
3410 {
3411 stream t = stream_init ();
3412 compile_expr (SCHEME_A_ t, car (x));
3413 stream_put_v (s, stream_size (t));
3414 stream_put_stream (s, t);
3415 }
3416
3417 stream_put_v (s, 0);
3418}
3419
3420static void
3421compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3422{
3423 stream sift = stream_init (); compile_expr (SCHEME_A_ sift, ift);
3424
3425 stream_put (s, BOP_IF);
3426 compile_expr (SCHEME_A_ s, cond);
3427 stream_put_v (s, stream_size (sift));
3428 stream_put_stream (s, sift);
3429 compile_expr (SCHEME_A_ s, iff);
3430}
3431
3432typedef uint32_t stream_fixup;
3433
3434static stream_fixup
3435stream_put_fixup (stream s)
3436{
3437 stream_put (s, 0);
3438 stream_put (s, 0);
3439
3440 return stream_size (s);
3441}
3442
3443static void
3444stream_fix_fixup (stream s, stream_fixup fixup, uint32_t target)
3445{
3446 target -= fixup;
3447 assert (target < (1 << 14));
3448 stream_data (s)[fixup - 2] = target | 0x80;
3449 stream_data (s)[fixup - 1] = target >> 7;
3450}
3451
3452static void
3453compile_and_or (SCHEME_P_ stream s, int and, pointer x)
3454{
3455 for (; cdr (x) != NIL; x = cdr (x))
3456 {
3457 stream t = stream_init ();
3458 compile_expr (SCHEME_A_ t, car (x));
3459 stream_put_v (s, stream_size (t));
3460 stream_put_stream (s, t);
3461 }
3462
3463 stream_put_v (s, 0);
3464}
3465
3466static void
3467compile_case (SCHEME_P_ stream s, pointer x)
3468{
3469 compile_expr (SCHEME_A_ s, caar (x));
3470
3471 for (;;)
3472 {
3473 x = cdr (x);
3474
3475 if (x == NIL)
3476 break;
3477
3478 compile_expr (SCHEME_A_ s, caar (x));
3479 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3480 stream_put_v (s, stream_size (t));
3481 stream_put_stream (s, t);
3482 }
3483
3484 stream_put_v (s, 0);
3485}
3486
3487static void
3488compile_cond (SCHEME_P_ stream s, pointer x)
3489{
3490 for ( ; x != NIL; x = cdr (x))
3491 {
3492 compile_expr (SCHEME_A_ s, caar (x));
3493 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3494 stream_put_v (s, stream_size (t));
3495 stream_put_stream (s, t);
3496 }
3497
3498 stream_put_v (s, 0);
3499}
3500
3305static int 3501static pointer
3502lookup (SCHEME_P_ pointer x)
3503{
3504 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, x, 1);
3505
3506 if (x != NIL)
3507 x = slot_value_in_env (x);
3508
3509 return x;
3510}
3511
3512ecb_cold static void
3513compile_expr (SCHEME_P_ stream s, pointer x)
3514{
3515 if (x == NIL)
3516 {
3517 stream_put (s, BOP_NIL);
3518 return;
3519 }
3520
3521 if (is_pair (x))
3522 {
3523 pointer head = car (x);
3524
3525 if (is_syntax (head))
3526 {
3527 x = cdr (x);
3528
3529 switch (syntaxnum (head))
3530 {
3531 case OP_IF0: /* if */
3532 stream_put_v (s, BOP_IF);
3533 compile_if (SCHEME_A_ s, car (x), cadr (x), caddr (x));
3534 break;
3535
3536 case OP_OR0: /* or */
3537 stream_put_v (s, BOP_OR);
3538 compile_and_or (SCHEME_A_ s, 0, x);
3539 break;
3540
3541 case OP_AND0: /* and */
3542 stream_put_v (s, BOP_AND);
3543 compile_and_or (SCHEME_A_ s, 1, x);
3544 break;
3545
3546 case OP_CASE0: /* case */
3547 stream_put_v (s, BOP_CASE);
3548 compile_case (SCHEME_A_ s, x);
3549 break;
3550
3551 case OP_COND0: /* cond */
3552 stream_put_v (s, BOP_COND);
3553 compile_cond (SCHEME_A_ s, x);
3554 break;
3555
3556 case OP_LET0: /* let */
3557 case OP_LET0AST: /* let* */
3558 case OP_LET0REC: /* letrec */
3559 switch (syntaxnum (head))
3560 {
3561 case OP_LET0: stream_put (s, BOP_LET ); break;
3562 case OP_LET0AST: stream_put (s, BOP_LETAST); break;
3563 case OP_LET0REC: stream_put (s, BOP_LETREC); break;
3564 }
3565
3566 {
3567 pointer bindings = car (x);
3568 pointer body = cadr (x);
3569
3570 for (x = bindings; x != NIL; x = cdr (x))
3571 {
3572 pointer init = NIL;
3573 pointer var = car (x);
3574
3575 if (is_pair (var))
3576 {
3577 init = cdr (var);
3578 var = car (var);
3579 }
3580
3581 stream_put_v (s, symbol_id (SCHEME_A_ var));
3582 compile_expr (SCHEME_A_ s, init);
3583 }
3584
3585 stream_put_v (s, 0);
3586 compile_expr (SCHEME_A_ s, body);
3587 }
3588 break;
3589
3590 case OP_DEF0: /* define */
3591 case OP_MACRO0: /* macro */
3592 stream_put (s, syntaxnum (head) == OP_DEF0 ? BOP_DEFINE : BOP_MACRO);
3593 stream_put_v (s, cell_id (SCHEME_A_ car (x)));
3594 compile_expr (SCHEME_A_ s, cadr (x));
3595 break;
3596
3597 case OP_SET0: /* set! */
3598 stream_put (s, BOP_SET);
3599 stream_put_v (s, symbol_id (SCHEME_A_ car (x)));
3600 compile_expr (SCHEME_A_ s, cadr (x));
3601 break;
3602
3603 case OP_BEGIN: /* begin */
3604 stream_put (s, BOP_BEGIN);
3605 compile_list (SCHEME_A_ s, x);
3606 return;
3607
3608 case OP_DELAY: /* delay */
3609 abort ();
3610 break;
3611
3612 case OP_QUOTE: /* quote */
3613 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3614 break;
3615
3616 case OP_LAMBDA: /* lambda */
3617 {
3618 pointer formals = car (x);
3619 pointer body = cadr (x);
3620
3621 stream_put (s, BOP_LAMBDA);
3622
3623 for (; is_pair (formals); formals = cdr (formals))
3624 stream_put_v (s, symbol_id (SCHEME_A_ car (formals)));
3625
3626 stream_put_v (s, 0);
3627 stream_put_v (s, formals == NIL ? 0 : symbol_id (SCHEME_A_ formals));
3628
3629 compile_expr (SCHEME_A_ s, body);
3630 }
3631 break;
3632
3633 case OP_C0STREAM:/* cons-stream */
3634 abort ();
3635 break;
3636 }
3637
3638 return;
3639 }
3640
3641 pointer m = lookup (SCHEME_A_ head);
3642
3643 if (is_macro (m))
3644 {
3645 s_save (SCHEME_A_ OP_DEBUG2, SCHEME_V->args, SCHEME_V->code);
3646 SCHEME_V->code = m;
3647 SCHEME_V->args = cons (x, NIL);
3648 Eval_Cycle (SCHEME_A_ OP_APPLY);
3649 x = SCHEME_V->value;
3650 compile_expr (SCHEME_A_ s, SCHEME_V->value);
3651 return;
3652 }
3653
3654 stream_put (s, BOP_LIST_BEG);
3655
3656 for (; x != NIL; x = cdr (x))
3657 compile_expr (SCHEME_A_ s, car (x));
3658
3659 stream_put (s, BOP_LIST_END);
3660 return;
3661 }
3662
3663 switch (type (x))
3664 {
3665 case T_INTEGER:
3666 {
3667 IVALUE iv = ivalue_unchecked (x);
3668 iv = iv < 0 ? ((~(uint32_t)iv) << 1) | 1 : (uint32_t)iv << 1;
3669 stream_put_tv (s, BOP_INTEGER, iv);
3670 }
3671 return;
3672
3673 case T_SYMBOL:
3674 if (0)
3675 {
3676 // no can do without more analysis
3677 pointer m = lookup (SCHEME_A_ x);
3678
3679 if (is_proc (m))
3680 {
3681 printf ("compile proc %s %d\n", procname(m), procnum(m));
3682 stream_put_tv (s, BOP_SYMBOL, BOP_OP + procnum (m));
3683 }
3684 else
3685 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3686 }
3687
3688 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3689 return;
3690
3691 default:
3692 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3693 break;
3694 }
3695}
3696
3697ecb_cold static int
3698compile_closure (SCHEME_P_ pointer p)
3699{
3700 stream s = stream_init ();
3701
3702 compile_list (SCHEME_A_ s, cdar (p));
3703
3704 FILE *xxd = popen ("xxd", "we");
3705 fwrite (stream_data (s), 1, stream_size (s), xxd);
3706 fclose (xxd);
3707
3708 return stream_size (s);
3709}
3710
3711#endif
3712
3713/* syntax, eval, core, ... */
3714ecb_hot static int
3306opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3715opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3307{ 3716{
3308 pointer args = SCHEME_V->args; 3717 pointer args = SCHEME_V->args;
3309 pointer x, y; 3718 pointer x, y;
3310 3719
3311 switch (op) 3720 switch (op)
3312 { 3721 {
3313#if 1 //D 3722#if EXPERIMENT //D
3314 case OP_DEBUG: 3723 case OP_DEBUG:
3315 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8); 3724 {
3725 uint32_t len = compile_closure (SCHEME_A_ car (args));
3726 printf ("len = %d\n", len);
3316 printf ("\n"); 3727 printf ("\n");
3317 s_return (S_T); 3728 s_return (S_T);
3729 }
3730
3731 case OP_DEBUG2:
3732 return -1;
3318#endif 3733#endif
3734
3319 case OP_LOAD: /* load */ 3735 case OP_LOAD: /* load */
3320 if (file_interactive (SCHEME_A)) 3736 if (file_interactive (SCHEME_A))
3321 { 3737 {
3322 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3738 putstr (SCHEME_A_ "Loading ");
3323 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3739 putstr (SCHEME_A_ strvalue (car (args)));
3740 putcharacter (SCHEME_A_ '\n');
3324 } 3741 }
3325 3742
3326 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3743 if (!file_push (SCHEME_A_ strvalue (car (args))))
3327 Error_1 ("unable to open", car (args)); 3744 Error_1 ("unable to open", car (args));
3328 else 3745
3329 {
3330 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3746 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3331 s_goto (OP_T0LVL); 3747 s_goto (OP_T0LVL);
3332 }
3333 3748
3334 case OP_T0LVL: /* top level */ 3749 case OP_T0LVL: /* top level */
3335 3750
3336 /* If we reached the end of file, this loop is done. */ 3751 /* If we reached the end of file, this loop is done. */
3337 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3752 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3338 { 3753 {
3339 if (SCHEME_V->file_i == 0) 3754 if (SCHEME_V->file_i == 0)
3340 { 3755 {
3341 SCHEME_V->args = NIL; 3756 SCHEME_V->args = NIL;
3342 s_goto (OP_QUIT); 3757 s_goto (OP_QUIT);
… …
3353 /* If interactive, be nice to user. */ 3768 /* If interactive, be nice to user. */
3354 if (file_interactive (SCHEME_A)) 3769 if (file_interactive (SCHEME_A))
3355 { 3770 {
3356 SCHEME_V->envir = SCHEME_V->global_env; 3771 SCHEME_V->envir = SCHEME_V->global_env;
3357 dump_stack_reset (SCHEME_A); 3772 dump_stack_reset (SCHEME_A);
3358 putstr (SCHEME_A_ "\n"); 3773 putcharacter (SCHEME_A_ '\n');
3774#if EXPERIMENT
3775 system ("ps v $PPID");
3776#endif
3359 putstr (SCHEME_A_ prompt); 3777 putstr (SCHEME_A_ prompt);
3360 } 3778 }
3361 3779
3362 /* Set up another iteration of REPL */ 3780 /* Set up another iteration of REPL */
3363 SCHEME_V->nesting = 0; 3781 SCHEME_V->nesting = 0;
… …
3398 { 3816 {
3399 SCHEME_V->print_flag = 1; 3817 SCHEME_V->print_flag = 1;
3400 SCHEME_V->args = SCHEME_V->value; 3818 SCHEME_V->args = SCHEME_V->value;
3401 s_goto (OP_P0LIST); 3819 s_goto (OP_P0LIST);
3402 } 3820 }
3403 else 3821
3404 s_return (SCHEME_V->value); 3822 s_return (SCHEME_V->value);
3405 3823
3406 case OP_EVAL: /* main part of evaluation */ 3824 case OP_EVAL: /* main part of evaluation */
3407#if USE_TRACING 3825#if USE_TRACING
3408 if (SCHEME_V->tracing) 3826 if (SCHEME_V->tracing)
3409 { 3827 {
… …
3420#endif 3838#endif
3421 if (is_symbol (SCHEME_V->code)) /* symbol */ 3839 if (is_symbol (SCHEME_V->code)) /* symbol */
3422 { 3840 {
3423 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3841 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3424 3842
3425 if (x != NIL) 3843 if (x == NIL)
3426 s_return (slot_value_in_env (x));
3427 else
3428 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3844 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3845
3846 s_return (slot_value_in_env (x));
3429 } 3847 }
3430 else if (is_pair (SCHEME_V->code)) 3848 else if (is_pair (SCHEME_V->code))
3431 { 3849 {
3432 x = car (SCHEME_V->code); 3850 x = car (SCHEME_V->code);
3433 3851
… …
3442 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3860 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3443 SCHEME_V->code = x; 3861 SCHEME_V->code = x;
3444 s_goto (OP_EVAL); 3862 s_goto (OP_EVAL);
3445 } 3863 }
3446 } 3864 }
3447 else 3865
3448 s_return (SCHEME_V->code); 3866 s_return (SCHEME_V->code);
3449 3867
3450 case OP_E0ARGS: /* eval arguments */ 3868 case OP_E0ARGS: /* eval arguments */
3451 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */ 3869 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3452 { 3870 {
3453 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3871 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3454 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3872 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3455 SCHEME_V->code = SCHEME_V->value; 3873 SCHEME_V->code = SCHEME_V->value;
3456 s_goto (OP_APPLY); 3874 s_goto (OP_APPLY);
3457 } 3875 }
3458 else 3876
3459 {
3460 SCHEME_V->code = cdr (SCHEME_V->code); 3877 SCHEME_V->code = cdr (SCHEME_V->code);
3461 s_goto (OP_E1ARGS); 3878 s_goto (OP_E1ARGS);
3462 }
3463 3879
3464 case OP_E1ARGS: /* eval arguments */ 3880 case OP_E1ARGS: /* eval arguments */
3465 args = cons (SCHEME_V->value, args); 3881 args = cons (SCHEME_V->value, args);
3466 3882
3467 if (is_pair (SCHEME_V->code)) /* continue */ 3883 if (is_pair (SCHEME_V->code)) /* continue */
… …
3478 SCHEME_V->args = cdr (args); 3894 SCHEME_V->args = cdr (args);
3479 s_goto (OP_APPLY); 3895 s_goto (OP_APPLY);
3480 } 3896 }
3481 3897
3482#if USE_TRACING 3898#if USE_TRACING
3483
3484 case OP_TRACING: 3899 case OP_TRACING:
3485 { 3900 {
3486 int tr = SCHEME_V->tracing; 3901 int tr = SCHEME_V->tracing;
3487 3902
3488 SCHEME_V->tracing = ivalue_unchecked (car (args)); 3903 SCHEME_V->tracing = ivalue_unchecked (car (args));
3489 s_return (mk_integer (SCHEME_A_ tr)); 3904 s_return (mk_integer (SCHEME_A_ tr));
3490 } 3905 }
3491
3492#endif 3906#endif
3493 3907
3494 case OP_APPLY: /* apply 'code' to 'args' */ 3908 case OP_APPLY: /* apply 'code' to 'args' */
3495#if USE_TRACING 3909#if USE_TRACING
3496 if (SCHEME_V->tracing) 3910 if (SCHEME_V->tracing)
… …
3510 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3924 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3511 else if (is_foreign (SCHEME_V->code)) 3925 else if (is_foreign (SCHEME_V->code))
3512 { 3926 {
3513 /* Keep nested calls from GC'ing the arglist */ 3927 /* Keep nested calls from GC'ing the arglist */
3514 push_recent_alloc (SCHEME_A_ args, NIL); 3928 push_recent_alloc (SCHEME_A_ args, NIL);
3515 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3929 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3516 3930
3517 s_return (x); 3931 s_return (x);
3518 } 3932 }
3519 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3933 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3520 { 3934 {
… …
3550 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3964 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3551 { 3965 {
3552 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3966 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3553 s_return (args != NIL ? car (args) : NIL); 3967 s_return (args != NIL ? car (args) : NIL);
3554 } 3968 }
3555 else 3969
3556 Error_0 ("illegal function"); 3970 Error_0 ("illegal function");
3557 3971
3558 case OP_DOMACRO: /* do macro */ 3972 case OP_DOMACRO: /* do macro */
3559 SCHEME_V->code = SCHEME_V->value; 3973 SCHEME_V->code = SCHEME_V->value;
3560 s_goto (OP_EVAL); 3974 s_goto (OP_EVAL);
3561
3562#if 1
3563 3975
3564 case OP_LAMBDA: /* lambda */ 3976 case OP_LAMBDA: /* lambda */
3565 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3977 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3566 set SCHEME_V->value fall thru */ 3978 set SCHEME_V->value fall thru */
3567 { 3979 {
… …
3574 SCHEME_V->code = slot_value_in_env (f); 3986 SCHEME_V->code = slot_value_in_env (f);
3575 s_goto (OP_APPLY); 3987 s_goto (OP_APPLY);
3576 } 3988 }
3577 3989
3578 SCHEME_V->value = SCHEME_V->code; 3990 SCHEME_V->value = SCHEME_V->code;
3579 /* Fallthru */
3580 } 3991 }
3992 /* Fallthru */
3581 3993
3582 case OP_LAMBDA1: 3994 case OP_LAMBDA1:
3583 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3995 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3584
3585#else
3586
3587 case OP_LAMBDA: /* lambda */
3588 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3589
3590#endif
3591 3996
3592 case OP_MKCLOSURE: /* make-closure */ 3997 case OP_MKCLOSURE: /* make-closure */
3593 x = car (args); 3998 x = car (args);
3594 3999
3595 if (car (x) == SCHEME_V->LAMBDA) 4000 if (car (x) == SCHEME_V->LAMBDA)
… …
3634 else 4039 else
3635 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 4040 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3636 4041
3637 s_return (SCHEME_V->code); 4042 s_return (SCHEME_V->code);
3638 4043
3639
3640 case OP_DEFP: /* defined? */ 4044 case OP_DEFP: /* defined? */
3641 x = SCHEME_V->envir; 4045 x = SCHEME_V->envir;
3642 4046
3643 if (cdr (args) != NIL) 4047 if (cdr (args) != NIL)
3644 x = cadr (args); 4048 x = cadr (args);
… …
3662 s_return (SCHEME_V->value); 4066 s_return (SCHEME_V->value);
3663 } 4067 }
3664 else 4068 else
3665 Error_1 ("set!: unbound variable:", SCHEME_V->code); 4069 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3666 4070
3667
3668 case OP_BEGIN: /* begin */ 4071 case OP_BEGIN: /* begin */
3669 if (!is_pair (SCHEME_V->code)) 4072 if (!is_pair (SCHEME_V->code))
3670 s_return (SCHEME_V->code); 4073 s_return (SCHEME_V->code);
3671 4074
3672 if (cdr (SCHEME_V->code) != NIL) 4075 if (cdr (SCHEME_V->code) != NIL)
… …
3683 case OP_IF1: /* if */ 4086 case OP_IF1: /* if */
3684 if (is_true (SCHEME_V->value)) 4087 if (is_true (SCHEME_V->value))
3685 SCHEME_V->code = car (SCHEME_V->code); 4088 SCHEME_V->code = car (SCHEME_V->code);
3686 else 4089 else
3687 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 4090 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
4091
3688 s_goto (OP_EVAL); 4092 s_goto (OP_EVAL);
3689 4093
3690 case OP_LET0: /* let */ 4094 case OP_LET0: /* let */
3691 SCHEME_V->args = NIL; 4095 SCHEME_V->args = NIL;
3692 SCHEME_V->value = SCHEME_V->code; 4096 SCHEME_V->value = SCHEME_V->code;
3693 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 4097 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3694 s_goto (OP_LET1); 4098 s_goto (OP_LET1);
3695 4099
3696 case OP_LET1: /* let (calculate parameters) */ 4100 case OP_LET1: /* let (calculate parameters) */
4101 case OP_LET1REC: /* letrec (calculate parameters) */
3697 args = cons (SCHEME_V->value, args); 4102 args = cons (SCHEME_V->value, args);
3698 4103
3699 if (is_pair (SCHEME_V->code)) /* continue */ 4104 if (is_pair (SCHEME_V->code)) /* continue */
3700 { 4105 {
3701 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 4106 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3702 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 4107 Error_1 ("Bad syntax of binding spec in let/letrec:", car (SCHEME_V->code));
3703 4108
3704 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4109 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3705 SCHEME_V->code = cadar (SCHEME_V->code); 4110 SCHEME_V->code = cadar (SCHEME_V->code);
3706 SCHEME_V->args = NIL; 4111 SCHEME_V->args = NIL;
3707 s_goto (OP_EVAL); 4112 s_goto (OP_EVAL);
3708 } 4113 }
3709 else /* end */ 4114
3710 { 4115 /* end */
3711 args = reverse_in_place (SCHEME_A_ NIL, args); 4116 args = reverse_in_place (SCHEME_A_ NIL, args);
3712 SCHEME_V->code = car (args); 4117 SCHEME_V->code = car (args);
3713 SCHEME_V->args = cdr (args); 4118 SCHEME_V->args = cdr (args);
3714 s_goto (OP_LET2); 4119 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3715 }
3716 4120
3717 case OP_LET2: /* let */ 4121 case OP_LET2: /* let */
3718 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4122 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3719 4123
3720 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args; 4124 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
… …
3724 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4128 if (is_symbol (car (SCHEME_V->code))) /* named let */
3725 { 4129 {
3726 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x)) 4130 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3727 { 4131 {
3728 if (!is_pair (x)) 4132 if (!is_pair (x))
3729 Error_1 ("Bad syntax of binding in let :", x); 4133 Error_1 ("Bad syntax of binding in let:", x);
3730 4134
3731 if (!is_list (SCHEME_A_ car (x))) 4135 if (!is_list (SCHEME_A_ car (x)))
3732 Error_1 ("Bad syntax of binding in let :", car (x)); 4136 Error_1 ("Bad syntax of binding in let:", car (x));
3733 4137
3734 args = cons (caar (x), args); 4138 args = cons (caar (x), args);
3735 } 4139 }
3736 4140
3737 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)), 4141 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
… …
3754 SCHEME_V->code = cdr (SCHEME_V->code); 4158 SCHEME_V->code = cdr (SCHEME_V->code);
3755 s_goto (OP_BEGIN); 4159 s_goto (OP_BEGIN);
3756 } 4160 }
3757 4161
3758 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code))) 4162 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code)))
3759 Error_1 ("Bad syntax of binding spec in let* :", car (SCHEME_V->code)); 4163 Error_1 ("Bad syntax of binding spec in let*:", car (SCHEME_V->code));
3760 4164
3761 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code)); 4165 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code));
3762 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4166 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3763 s_goto (OP_EVAL); 4167 s_goto (OP_EVAL);
3764 4168
… …
3775 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4179 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3776 SCHEME_V->code = cadar (SCHEME_V->code); 4180 SCHEME_V->code = cadar (SCHEME_V->code);
3777 SCHEME_V->args = NIL; 4181 SCHEME_V->args = NIL;
3778 s_goto (OP_EVAL); 4182 s_goto (OP_EVAL);
3779 } 4183 }
3780 else /* end */ 4184
4185 /* end */
3781 { 4186
3782 SCHEME_V->code = args; 4187 SCHEME_V->code = args;
3783 SCHEME_V->args = NIL; 4188 SCHEME_V->args = NIL;
3784 s_goto (OP_BEGIN); 4189 s_goto (OP_BEGIN);
3785 }
3786 4190
3787 case OP_LET0REC: /* letrec */ 4191 case OP_LET0REC: /* letrec */
3788 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4192 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3789 SCHEME_V->args = NIL; 4193 SCHEME_V->args = NIL;
3790 SCHEME_V->value = SCHEME_V->code; 4194 SCHEME_V->value = SCHEME_V->code;
3791 SCHEME_V->code = car (SCHEME_V->code); 4195 SCHEME_V->code = car (SCHEME_V->code);
3792 s_goto (OP_LET1REC); 4196 s_goto (OP_LET1REC);
3793 4197
3794 case OP_LET1REC: /* letrec (calculate parameters) */ 4198 /* OP_LET1REC handled by OP_LET1 */
3795 args = cons (SCHEME_V->value, args);
3796
3797 if (is_pair (SCHEME_V->code)) /* continue */
3798 {
3799 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3800 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3801
3802 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3803 SCHEME_V->code = cadar (SCHEME_V->code);
3804 SCHEME_V->args = NIL;
3805 s_goto (OP_EVAL);
3806 }
3807 else /* end */
3808 {
3809 args = reverse_in_place (SCHEME_A_ NIL, args);
3810 SCHEME_V->code = car (args);
3811 SCHEME_V->args = cdr (args);
3812 s_goto (OP_LET2REC);
3813 }
3814 4199
3815 case OP_LET2REC: /* letrec */ 4200 case OP_LET2REC: /* letrec */
3816 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y)) 4201 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3817 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4202 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3818 4203
… …
3848 } 4233 }
3849 else 4234 else
3850 { 4235 {
3851 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4236 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3852 s_return (NIL); 4237 s_return (NIL);
3853 else 4238
3854 {
3855 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4239 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3856 SCHEME_V->code = caar (SCHEME_V->code); 4240 SCHEME_V->code = caar (SCHEME_V->code);
3857 s_goto (OP_EVAL); 4241 s_goto (OP_EVAL);
3858 }
3859 } 4242 }
3860 4243
3861 case OP_DELAY: /* delay */ 4244 case OP_DELAY: /* delay */
3862 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 4245 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3863 set_typeflag (x, T_PROMISE); 4246 set_typeflag (x, T_PROMISE);
… …
3874 case OP_AND1: /* and */ 4257 case OP_AND1: /* and */
3875 if (is_false (SCHEME_V->value)) 4258 if (is_false (SCHEME_V->value))
3876 s_return (SCHEME_V->value); 4259 s_return (SCHEME_V->value);
3877 else if (SCHEME_V->code == NIL) 4260 else if (SCHEME_V->code == NIL)
3878 s_return (SCHEME_V->value); 4261 s_return (SCHEME_V->value);
3879 else 4262
3880 {
3881 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4263 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3882 SCHEME_V->code = car (SCHEME_V->code); 4264 SCHEME_V->code = car (SCHEME_V->code);
3883 s_goto (OP_EVAL); 4265 s_goto (OP_EVAL);
3884 }
3885 4266
3886 case OP_OR0: /* or */ 4267 case OP_OR0: /* or */
3887 if (SCHEME_V->code == NIL) 4268 if (SCHEME_V->code == NIL)
3888 s_return (S_F); 4269 s_return (S_F);
3889 4270
… …
3894 case OP_OR1: /* or */ 4275 case OP_OR1: /* or */
3895 if (is_true (SCHEME_V->value)) 4276 if (is_true (SCHEME_V->value))
3896 s_return (SCHEME_V->value); 4277 s_return (SCHEME_V->value);
3897 else if (SCHEME_V->code == NIL) 4278 else if (SCHEME_V->code == NIL)
3898 s_return (SCHEME_V->value); 4279 s_return (SCHEME_V->value);
3899 else 4280
3900 {
3901 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4281 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3902 SCHEME_V->code = car (SCHEME_V->code); 4282 SCHEME_V->code = car (SCHEME_V->code);
3903 s_goto (OP_EVAL); 4283 s_goto (OP_EVAL);
3904 }
3905 4284
3906 case OP_C0STREAM: /* cons-stream */ 4285 case OP_C0STREAM: /* cons-stream */
3907 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4286 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3908 SCHEME_V->code = car (SCHEME_V->code); 4287 SCHEME_V->code = car (SCHEME_V->code);
3909 s_goto (OP_EVAL); 4288 s_goto (OP_EVAL);
… …
3974 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4353 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3975 SCHEME_V->code = caar (x); 4354 SCHEME_V->code = caar (x);
3976 s_goto (OP_EVAL); 4355 s_goto (OP_EVAL);
3977 } 4356 }
3978 } 4357 }
3979 else 4358
3980 s_return (NIL); 4359 s_return (NIL);
3981 4360
3982 case OP_CASE2: /* case */ 4361 case OP_CASE2: /* case */
3983 if (is_true (SCHEME_V->value)) 4362 if (is_true (SCHEME_V->value))
3984 s_goto (OP_BEGIN); 4363 s_goto (OP_BEGIN);
3985 else 4364
3986 s_return (NIL); 4365 s_return (NIL);
3987 4366
3988 case OP_PAPPLY: /* apply */ 4367 case OP_PAPPLY: /* apply */
3989 SCHEME_V->code = car (args); 4368 SCHEME_V->code = car (args);
3990 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4369 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3991 /*SCHEME_V->args = cadr(args); */ 4370 /*SCHEME_V->args = cadr(args); */
… …
4005 } 4384 }
4006 4385
4007 if (USE_ERROR_CHECKING) abort (); 4386 if (USE_ERROR_CHECKING) abort ();
4008} 4387}
4009 4388
4010static int 4389/* math, cxr */
4390ecb_hot static int
4011opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4391opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4012{ 4392{
4013 pointer args = SCHEME_V->args; 4393 pointer args = SCHEME_V->args;
4014 pointer x = car (args); 4394 pointer x = car (args);
4015 num v; 4395 num v;
4016 4396
4017 switch (op) 4397 switch (op)
4018 { 4398 {
4019#if USE_MATH 4399#if USE_MATH
4020 case OP_INEX2EX: /* inexact->exact */ 4400 case OP_INEX2EX: /* inexact->exact */
4021 {
4022 if (is_integer (x)) 4401 if (!is_integer (x))
4023 s_return (x); 4402 {
4024
4025 RVALUE r = rvalue_unchecked (x); 4403 RVALUE r = rvalue_unchecked (x);
4026 4404
4027 if (r == (RVALUE)(IVALUE)r) 4405 if (r == (RVALUE)(IVALUE)r)
4028 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4406 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
4029 else 4407 else
4030 Error_1 ("inexact->exact: not integral:", x); 4408 Error_1 ("inexact->exact: not integral:", x);
4031 } 4409 }
4032 4410
4411 s_return (x);
4412
4413 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4414 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4415 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4416 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4417
4418 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4033 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4419 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4034 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4420 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4421 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
4035 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4422 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4036 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4423 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4037 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4424 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4038 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4425 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4039 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4426 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4040 4427
4041 case OP_ATAN: 4428 case OP_ATAN:
4429 s_return (mk_real (SCHEME_A_
4042 if (cdr (args) == NIL) 4430 cdr (args) == NIL
4043 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4431 ? atan (rvalue (x))
4044 else 4432 : atan2 (rvalue (x), rvalue (cadr (args)))));
4045 {
4046 pointer y = cadr (args);
4047 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4048 }
4049
4050 case OP_SQRT:
4051 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4052 4433
4053 case OP_EXPT: 4434 case OP_EXPT:
4054 { 4435 {
4055 RVALUE result; 4436 RVALUE result;
4056 int real_result = 1; 4437 int real_result = 1;
… …
4079 if (real_result) 4460 if (real_result)
4080 s_return (mk_real (SCHEME_A_ result)); 4461 s_return (mk_real (SCHEME_A_ result));
4081 else 4462 else
4082 s_return (mk_integer (SCHEME_A_ result)); 4463 s_return (mk_integer (SCHEME_A_ result));
4083 } 4464 }
4084
4085 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4086 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4087
4088 case OP_TRUNCATE:
4089 {
4090 RVALUE n = rvalue (x);
4091 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4092 }
4093
4094 case OP_ROUND:
4095 if (is_integer (x))
4096 s_return (x);
4097
4098 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4099#endif 4465#endif
4100 4466
4101 case OP_ADD: /* + */ 4467 case OP_ADD: /* + */
4102 v = num_zero; 4468 v = num_zero;
4103 4469
… …
4191 else 4557 else
4192 Error_0 ("modulo: division by zero"); 4558 Error_0 ("modulo: division by zero");
4193 4559
4194 s_return (mk_number (SCHEME_A_ v)); 4560 s_return (mk_number (SCHEME_A_ v));
4195 4561
4196 case OP_CAR: /* car */ 4562 /* the compiler will optimize this mess... */
4197 s_return (caar (args)); 4563 case OP_CAR: op_car: s_return (car (x));
4198 4564 case OP_CDR: op_cdr: s_return (cdr (x));
4199 case OP_CDR: /* cdr */ 4565 case OP_CAAR: op_caar: x = car (x); goto op_car;
4200 s_return (cdar (args)); 4566 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4567 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4568 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4569 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4570 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4571 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4572 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4573 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4574 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4575 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4576 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4577 case OP_CAAAAR: x = car (x); goto op_caaar;
4578 case OP_CAAADR: x = cdr (x); goto op_caaar;
4579 case OP_CAADAR: x = car (x); goto op_caadr;
4580 case OP_CAADDR: x = cdr (x); goto op_caadr;
4581 case OP_CADAAR: x = car (x); goto op_cadar;
4582 case OP_CADADR: x = cdr (x); goto op_cadar;
4583 case OP_CADDAR: x = car (x); goto op_caddr;
4584 case OP_CADDDR: x = cdr (x); goto op_caddr;
4585 case OP_CDAAAR: x = car (x); goto op_cdaar;
4586 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4587 case OP_CDADAR: x = car (x); goto op_cdadr;
4588 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4589 case OP_CDDAAR: x = car (x); goto op_cddar;
4590 case OP_CDDADR: x = cdr (x); goto op_cddar;
4591 case OP_CDDDAR: x = car (x); goto op_cdddr;
4592 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4201 4593
4202 case OP_CONS: /* cons */ 4594 case OP_CONS: /* cons */
4203 set_cdr (args, cadr (args)); 4595 set_cdr (args, cadr (args));
4204 s_return (args); 4596 s_return (args);
4205 4597
… …
4379 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4771 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4380 4772
4381 s_return (newstr); 4773 s_return (newstr);
4382 } 4774 }
4383 4775
4384 case OP_SUBSTR: /* substring */ 4776 case OP_STRING_COPY: /* substring/string-copy */
4385 { 4777 {
4386 char *str = strvalue (x); 4778 char *str = strvalue (x);
4387 int index0 = ivalue_unchecked (cadr (args)); 4779 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4388 int index1; 4780 int index1;
4389 int len; 4781 int len;
4390 4782
4391 if (index0 > strlength (x)) 4783 if (index0 > strlength (x))
4392 Error_1 ("substring: start out of bounds:", cadr (args)); 4784 Error_1 ("string->copy: start out of bounds:", cadr (args));
4393 4785
4394 if (cddr (args) != NIL) 4786 if (cddr (args) != NIL)
4395 { 4787 {
4396 index1 = ivalue_unchecked (caddr (args)); 4788 index1 = ivalue_unchecked (caddr (args));
4397 4789
4398 if (index1 > strlength (x) || index1 < index0) 4790 if (index1 > strlength (x) || index1 < index0)
4399 Error_1 ("substring: end out of bounds:", caddr (args)); 4791 Error_1 ("string->copy: end out of bounds:", caddr (args));
4400 } 4792 }
4401 else 4793 else
4402 index1 = strlength (x); 4794 index1 = strlength (x);
4403 4795
4404 len = index1 - index0; 4796 len = index1 - index0;
4405 x = mk_empty_string (SCHEME_A_ len, ' '); 4797 x = mk_counted_string (SCHEME_A_ str + index0, len);
4406 memcpy (strvalue (x), str + index0, len);
4407 strvalue (x)[len] = 0;
4408 4798
4409 s_return (x); 4799 s_return (x);
4410 } 4800 }
4411 4801
4412 case OP_VECTOR: /* vector */ 4802 case OP_VECTOR: /* vector */
… …
4486 } 4876 }
4487 4877
4488 if (USE_ERROR_CHECKING) abort (); 4878 if (USE_ERROR_CHECKING) abort ();
4489} 4879}
4490 4880
4491static int 4881/* relational ops */
4882ecb_hot static int
4492opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4883opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4493{ 4884{
4494 pointer x = SCHEME_V->args; 4885 pointer x = SCHEME_V->args;
4495 4886
4496 for (;;) 4887 for (;;)
… …
4517 } 4908 }
4518 4909
4519 s_return (S_T); 4910 s_return (S_T);
4520} 4911}
4521 4912
4522static int 4913/* predicates */
4914ecb_hot static int
4523opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4915opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4524{ 4916{
4525 pointer args = SCHEME_V->args; 4917 pointer args = SCHEME_V->args;
4526 pointer a = car (args); 4918 pointer a = car (args);
4527 pointer d = cdr (args); 4919 pointer d = cdr (args);
4528 int r; 4920 int r;
4529 4921
4530 switch (op) 4922 switch (op)
4531 { 4923 {
4532 case OP_NOT: /* not */ r = is_false (a) ; break; 4924 case OP_NOT: /* not */ r = is_false (a) ; break;
4533 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4925 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4534 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4926 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4535 case OP_NULLP: /* null? */ r = a == NIL ; break; 4927 case OP_NULLP: /* null? */ r = a == NIL ; break;
4536 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4928 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4929 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4537 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4930 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4538 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4931 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4539 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4932 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4540 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4933 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4541 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4934 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4542 4935
4543#if USE_CHAR_CLASSIFIERS 4936#if USE_CHAR_CLASSIFIERS
4544 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4937 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4545 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4938 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4546 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4939 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
… …
4573 } 4966 }
4574 4967
4575 s_retbool (r); 4968 s_retbool (r);
4576} 4969}
4577 4970
4578static int 4971/* promises, list ops, ports */
4972ecb_hot static int
4579opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4973opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4580{ 4974{
4581 pointer args = SCHEME_V->args; 4975 pointer args = SCHEME_V->args;
4582 pointer a = car (args); 4976 pointer a = car (args);
4583 pointer x, y; 4977 pointer x, y;
… …
4596 } 4990 }
4597 else 4991 else
4598 s_return (SCHEME_V->code); 4992 s_return (SCHEME_V->code);
4599 4993
4600 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4994 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4601 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4995 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4602 s_return (SCHEME_V->value); 4996 s_return (SCHEME_V->value);
4603 4997
4604#if USE_PORTS 4998#if USE_PORTS
4999
5000 case OP_EOF_OBJECT: /* eof-object */
5001 s_return (S_EOF);
4605 5002
4606 case OP_WRITE: /* write */ 5003 case OP_WRITE: /* write */
4607 case OP_DISPLAY: /* display */ 5004 case OP_DISPLAY: /* display */
4608 case OP_WRITE_CHAR: /* write-char */ 5005 case OP_WRITE_CHAR: /* write-char */
4609 if (is_pair (cdr (SCHEME_V->args))) 5006 if (is_pair (cdr (SCHEME_V->args)))
… …
4623 else 5020 else
4624 SCHEME_V->print_flag = 0; 5021 SCHEME_V->print_flag = 0;
4625 5022
4626 s_goto (OP_P0LIST); 5023 s_goto (OP_P0LIST);
4627 5024
5025 //TODO: move to scheme
4628 case OP_NEWLINE: /* newline */ 5026 case OP_NEWLINE: /* newline */
4629 if (is_pair (args)) 5027 if (is_pair (args))
4630 { 5028 {
4631 if (a != SCHEME_V->outport) 5029 if (a != SCHEME_V->outport)
4632 { 5030 {
… …
4634 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 5032 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4635 SCHEME_V->outport = a; 5033 SCHEME_V->outport = a;
4636 } 5034 }
4637 } 5035 }
4638 5036
4639 putstr (SCHEME_A_ "\n"); 5037 putcharacter (SCHEME_A_ '\n');
4640 s_return (S_T); 5038 s_return (S_T);
4641#endif 5039#endif
4642 5040
4643 case OP_ERR0: /* error */ 5041 case OP_ERR0: /* error */
4644 SCHEME_V->retcode = -1; 5042 SCHEME_V->retcode = -1;
… …
4653 putstr (SCHEME_A_ strvalue (car (args))); 5051 putstr (SCHEME_A_ strvalue (car (args)));
4654 SCHEME_V->args = cdr (args); 5052 SCHEME_V->args = cdr (args);
4655 s_goto (OP_ERR1); 5053 s_goto (OP_ERR1);
4656 5054
4657 case OP_ERR1: /* error */ 5055 case OP_ERR1: /* error */
4658 putstr (SCHEME_A_ " "); 5056 putcharacter (SCHEME_A_ ' ');
4659 5057
4660 if (args != NIL) 5058 if (args != NIL)
4661 { 5059 {
4662 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 5060 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4663 SCHEME_V->args = a; 5061 SCHEME_V->args = a;
4664 SCHEME_V->print_flag = 1; 5062 SCHEME_V->print_flag = 1;
4665 s_goto (OP_P0LIST); 5063 s_goto (OP_P0LIST);
4666 } 5064 }
4667 else 5065 else
4668 { 5066 {
4669 putstr (SCHEME_A_ "\n"); 5067 putcharacter (SCHEME_A_ '\n');
4670 5068
4671 if (SCHEME_V->interactive_repl) 5069 if (SCHEME_V->interactive_repl)
4672 s_goto (OP_T0LVL); 5070 s_goto (OP_T0LVL);
4673 else 5071 else
4674 return -1; 5072 return -1;
… …
4751 SCHEME_V->gc_verbose = (a != S_F); 5149 SCHEME_V->gc_verbose = (a != S_F);
4752 s_retbool (was); 5150 s_retbool (was);
4753 } 5151 }
4754 5152
4755 case OP_NEWSEGMENT: /* new-segment */ 5153 case OP_NEWSEGMENT: /* new-segment */
5154#if 0
4756 if (!is_pair (args) || !is_number (a)) 5155 if (!is_pair (args) || !is_number (a))
4757 Error_0 ("new-segment: argument must be a number"); 5156 Error_0 ("new-segment: argument must be a number");
4758 5157#endif
4759 alloc_cellseg (SCHEME_A_ ivalue (a)); 5158 s_retbool (alloc_cellseg (SCHEME_A));
4760
4761 s_return (S_T);
4762 5159
4763 case OP_OBLIST: /* oblist */ 5160 case OP_OBLIST: /* oblist */
4764 s_return (oblist_all_symbols (SCHEME_A)); 5161 s_return (oblist_all_symbols (SCHEME_A));
4765 5162
4766#if USE_PORTS 5163#if USE_PORTS
… …
4836 s_return (p == NIL ? S_F : p); 5233 s_return (p == NIL ? S_F : p);
4837 } 5234 }
4838 5235
4839 case OP_GET_OUTSTRING: /* get-output-string */ 5236 case OP_GET_OUTSTRING: /* get-output-string */
4840 { 5237 {
4841 port *p; 5238 port *p = port (a);
4842 5239
4843 if ((p = a->object.port)->kind & port_string) 5240 if (p->kind & port_string)
4844 { 5241 {
4845 off_t size; 5242 off_t size;
4846 char *str; 5243 char *str;
4847 5244
4848 size = p->rep.string.curr - p->rep.string.start + 1; 5245 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4883 } 5280 }
4884 5281
4885 if (USE_ERROR_CHECKING) abort (); 5282 if (USE_ERROR_CHECKING) abort ();
4886} 5283}
4887 5284
4888static int 5285/* reading */
5286ecb_cold static int
4889opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5287opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4890{ 5288{
4891 pointer args = SCHEME_V->args; 5289 pointer args = SCHEME_V->args;
4892 pointer x; 5290 pointer x;
4893 5291
… …
4953 int res; 5351 int res;
4954 5352
4955 if (is_pair (args)) 5353 if (is_pair (args))
4956 p = car (args); 5354 p = car (args);
4957 5355
4958 res = p->object.port->kind & port_string; 5356 res = port (p)->kind & port_string;
4959 5357
4960 s_retbool (res); 5358 s_retbool (res);
4961 } 5359 }
4962 5360
4963 case OP_SET_INPORT: /* set-input-port */ 5361 case OP_SET_INPORT: /* set-input-port */
… …
4972 case OP_RDSEXPR: 5370 case OP_RDSEXPR:
4973 switch (SCHEME_V->tok) 5371 switch (SCHEME_V->tok)
4974 { 5372 {
4975 case TOK_EOF: 5373 case TOK_EOF:
4976 s_return (S_EOF); 5374 s_return (S_EOF);
4977 /* NOTREACHED */
4978 5375
4979 case TOK_VEC: 5376 case TOK_VEC:
4980 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5377 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
4981 /* fall through */ 5378 /* fall through */
4982 5379
… …
4985 5382
4986 if (SCHEME_V->tok == TOK_RPAREN) 5383 if (SCHEME_V->tok == TOK_RPAREN)
4987 s_return (NIL); 5384 s_return (NIL);
4988 else if (SCHEME_V->tok == TOK_DOT) 5385 else if (SCHEME_V->tok == TOK_DOT)
4989 Error_0 ("syntax error: illegal dot expression"); 5386 Error_0 ("syntax error: illegal dot expression");
4990 else 5387
4991 {
4992 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5388 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
4993 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5389 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
4994 s_goto (OP_RDSEXPR); 5390 s_goto (OP_RDSEXPR);
4995 }
4996 5391
4997 case TOK_QUOTE: 5392 case TOK_QUOTE:
4998 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5393 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
4999 SCHEME_V->tok = token (SCHEME_A); 5394 SCHEME_V->tok = token (SCHEME_A);
5000 s_goto (OP_RDSEXPR); 5395 s_goto (OP_RDSEXPR);
… …
5006 { 5401 {
5007 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5402 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
5008 SCHEME_V->tok = TOK_LPAREN; 5403 SCHEME_V->tok = TOK_LPAREN;
5009 s_goto (OP_RDSEXPR); 5404 s_goto (OP_RDSEXPR);
5010 } 5405 }
5011 else 5406
5012 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5407 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
5013
5014 s_goto (OP_RDSEXPR); 5408 s_goto (OP_RDSEXPR);
5015 5409
5016 case TOK_COMMA: 5410 case TOK_COMMA:
5017 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5411 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
5018 SCHEME_V->tok = token (SCHEME_A); 5412 SCHEME_V->tok = token (SCHEME_A);
… …
5029 case TOK_DOTATOM: 5423 case TOK_DOTATOM:
5030 SCHEME_V->strbuff[0] = '.'; 5424 SCHEME_V->strbuff[0] = '.';
5031 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS))); 5425 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5032 5426
5033 case TOK_STRATOM: 5427 case TOK_STRATOM:
5428 //TODO: haven't checked whether the garbage collector could interfere and free x
5429 gc (SCHEME_A_ NIL, NIL); //TODO: superheavyhanded
5034 x = readstrexp (SCHEME_A_ '|'); 5430 x = readstrexp (SCHEME_A_ '|');
5035 //TODO: haven't checked whether the garbage collector could interfere
5036 s_return (mk_atom (SCHEME_A_ strvalue (x))); 5431 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5037 5432
5038 case TOK_DQUOTE: 5433 case TOK_DQUOTE:
5039 x = readstrexp (SCHEME_A_ '"'); 5434 x = readstrexp (SCHEME_A_ '"');
5040 5435
… …
5048 { 5443 {
5049 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1); 5444 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1);
5050 5445
5051 if (f == NIL) 5446 if (f == NIL)
5052 Error_0 ("undefined sharp expression"); 5447 Error_0 ("undefined sharp expression");
5053 else 5448
5054 {
5055 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5449 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
5056 s_goto (OP_EVAL); 5450 s_goto (OP_EVAL);
5057 }
5058 } 5451 }
5059 5452
5060 case TOK_SHARP_CONST: 5453 case TOK_SHARP_CONST:
5061 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL) 5454 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5062 Error_0 ("undefined sharp expression"); 5455 Error_0 ("undefined sharp expression");
5063 else 5456
5064 s_return (x); 5457 s_return (x);
5065 5458
5066 default: 5459 default:
5067 Error_0 ("syntax error: illegal token"); 5460 Error_0 ("syntax error: illegal token");
5068 } 5461 }
5069 5462
… …
5162 pointer b = cdr (args); 5555 pointer b = cdr (args);
5163 int ok_abbr = ok_abbrev (b); 5556 int ok_abbr = ok_abbrev (b);
5164 SCHEME_V->args = car (b); 5557 SCHEME_V->args = car (b);
5165 5558
5166 if (a == SCHEME_V->QUOTE && ok_abbr) 5559 if (a == SCHEME_V->QUOTE && ok_abbr)
5167 putstr (SCHEME_A_ "'"); 5560 putcharacter (SCHEME_A_ '\'');
5168 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5561 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5169 putstr (SCHEME_A_ "`"); 5562 putcharacter (SCHEME_A_ '`');
5170 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5563 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5171 putstr (SCHEME_A_ ","); 5564 putcharacter (SCHEME_A_ ',');
5172 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5565 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5173 putstr (SCHEME_A_ ",@"); 5566 putstr (SCHEME_A_ ",@");
5174 else 5567 else
5175 { 5568 {
5176 putstr (SCHEME_A_ "("); 5569 putcharacter (SCHEME_A_ '(');
5177 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5570 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5178 SCHEME_V->args = a; 5571 SCHEME_V->args = a;
5179 } 5572 }
5180 5573
5181 s_goto (OP_P0LIST); 5574 s_goto (OP_P0LIST);
… …
5183 5576
5184 case OP_P1LIST: 5577 case OP_P1LIST:
5185 if (is_pair (args)) 5578 if (is_pair (args))
5186 { 5579 {
5187 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5580 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5188 putstr (SCHEME_A_ " "); 5581 putcharacter (SCHEME_A_ ' ');
5189 SCHEME_V->args = car (args); 5582 SCHEME_V->args = car (args);
5190 s_goto (OP_P0LIST); 5583 s_goto (OP_P0LIST);
5191 } 5584 }
5192 else if (is_vector (args)) 5585 else if (is_vector (args))
5193 { 5586 {
… …
5201 { 5594 {
5202 putstr (SCHEME_A_ " . "); 5595 putstr (SCHEME_A_ " . ");
5203 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5596 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5204 } 5597 }
5205 5598
5206 putstr (SCHEME_A_ ")"); 5599 putcharacter (SCHEME_A_ ')');
5207 s_return (S_T); 5600 s_return (S_T);
5208 } 5601 }
5209 5602
5210 case OP_PVECFROM: 5603 case OP_PVECFROM:
5211 { 5604 {
5212 int i = ivalue_unchecked (cdr (args)); 5605 IVALUE i = ivalue_unchecked (cdr (args));
5213 pointer vec = car (args); 5606 pointer vec = car (args);
5214 int len = veclength (vec); 5607 uint32_t len = veclength (vec);
5215 5608
5216 if (i == len) 5609 if (i == len)
5217 { 5610 {
5218 putstr (SCHEME_A_ ")"); 5611 putcharacter (SCHEME_A_ ')');
5219 s_return (S_T); 5612 s_return (S_T);
5220 } 5613 }
5221 else 5614 else
5222 { 5615 {
5223 pointer elem = vector_get (vec, i); 5616 pointer elem = vector_get (vec, i);
5224 5617
5225 ivalue_unchecked (cdr (args)) = i + 1; 5618 set_cdr (args, mk_integer (SCHEME_A_ i + 1));
5226 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5619 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5227 SCHEME_V->args = elem; 5620 SCHEME_V->args = elem;
5228 5621
5229 if (i > 0) 5622 if (i > 0)
5230 putstr (SCHEME_A_ " "); 5623 putcharacter (SCHEME_A_ ' ');
5231 5624
5232 s_goto (OP_P0LIST); 5625 s_goto (OP_P0LIST);
5233 } 5626 }
5234 } 5627 }
5235 } 5628 }
5236 5629
5237 if (USE_ERROR_CHECKING) abort (); 5630 if (USE_ERROR_CHECKING) abort ();
5238} 5631}
5239 5632
5240static int 5633/* list ops */
5634ecb_hot static int
5241opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5635opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5242{ 5636{
5243 pointer args = SCHEME_V->args; 5637 pointer args = SCHEME_V->args;
5244 pointer a = car (args); 5638 pointer a = car (args);
5245 pointer x, y; 5639 pointer x, y;
… …
5268 break; 5662 break;
5269 } 5663 }
5270 5664
5271 if (is_pair (y)) 5665 if (is_pair (y))
5272 s_return (car (y)); 5666 s_return (car (y));
5273 else 5667
5274 s_return (S_F); 5668 s_return (S_F);
5275
5276 5669
5277 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5670 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5278 SCHEME_V->args = a; 5671 SCHEME_V->args = a;
5279 5672
5280 if (SCHEME_V->args == NIL) 5673 if (SCHEME_V->args == NIL)
5281 s_return (S_F); 5674 s_return (S_F);
5282 else if (is_closure (SCHEME_V->args)) 5675 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5283 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5676 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5284 else if (is_macro (SCHEME_V->args)) 5677
5285 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5286 else
5287 s_return (S_F); 5678 s_return (S_F);
5288 5679
5289 case OP_CLOSUREP: /* closure? */ 5680 case OP_CLOSUREP: /* closure? */
5290 /* 5681 /*
5291 * Note, macro object is also a closure. 5682 * Note, macro object is also a closure.
5292 * Therefore, (closure? <#MACRO>) ==> #t 5683 * Therefore, (closure? <#MACRO>) ==> #t
… …
5303 5694
5304/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5695/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5305typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5696typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5306 5697
5307typedef int (*test_predicate)(pointer); 5698typedef int (*test_predicate)(pointer);
5308static int 5699
5700ecb_hot static int
5309tst_any (pointer p) 5701tst_any (pointer p)
5310{ 5702{
5311 return 1; 5703 return 1;
5312} 5704}
5313 5705
5314static int 5706ecb_hot static int
5315tst_inonneg (pointer p) 5707tst_inonneg (pointer p)
5316{ 5708{
5317 return is_integer (p) && ivalue_unchecked (p) >= 0; 5709 return is_integer (p) && ivalue_unchecked (p) >= 0;
5318} 5710}
5319 5711
5320static int 5712ecb_hot static int
5321tst_is_list (SCHEME_P_ pointer p) 5713tst_is_list (SCHEME_P_ pointer p)
5322{ 5714{
5323 return p == NIL || is_pair (p); 5715 return p == NIL || is_pair (p);
5324} 5716}
5325 5717
… …
5368#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5760#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5369#include "opdefines.h" 5761#include "opdefines.h"
5370#undef OP_DEF 5762#undef OP_DEF
5371; 5763;
5372 5764
5373static const char * 5765ecb_cold static const char *
5374opname (int idx) 5766opname (int idx)
5375{ 5767{
5376 const char *name = opnames; 5768 const char *name = opnames;
5377 5769
5378 /* should do this at compile time, but would require external program, right? */ 5770 /* should do this at compile time, but would require external program, right? */
… …
5380 name += strlen (name) + 1; 5772 name += strlen (name) + 1;
5381 5773
5382 return *name ? name : "ILLEGAL"; 5774 return *name ? name : "ILLEGAL";
5383} 5775}
5384 5776
5385static const char * 5777ecb_cold static const char *
5386procname (pointer x) 5778procname (pointer x)
5387{ 5779{
5388 return opname (procnum (x)); 5780 return opname (procnum (x));
5389} 5781}
5390 5782
… …
5410#undef OP_DEF 5802#undef OP_DEF
5411 {0} 5803 {0}
5412}; 5804};
5413 5805
5414/* kernel of this interpreter */ 5806/* kernel of this interpreter */
5415static void ecb_hot 5807ecb_hot static void
5416Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5808Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5417{ 5809{
5418 SCHEME_V->op = op; 5810 SCHEME_V->op = op;
5419 5811
5420 for (;;) 5812 for (;;)
… …
5503 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5895 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5504 return; 5896 return;
5505 5897
5506 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5898 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5507 { 5899 {
5508 xwrstr ("No memory!\n"); 5900 putstr (SCHEME_A_ "No memory!\n");
5509 return; 5901 return;
5510 } 5902 }
5511 } 5903 }
5512} 5904}
5513 5905
5514/* ========== Initialization of internal keywords ========== */ 5906/* ========== Initialization of internal keywords ========== */
5515 5907
5516static void 5908ecb_cold static void
5517assign_syntax (SCHEME_P_ const char *name) 5909assign_syntax (SCHEME_P_ const char *name)
5518{ 5910{
5519 pointer x = oblist_add_by_name (SCHEME_A_ name); 5911 pointer x = oblist_add_by_name (SCHEME_A_ name);
5520 set_typeflag (x, typeflag (x) | T_SYNTAX); 5912 set_typeflag (x, typeflag (x) | T_SYNTAX);
5521} 5913}
5522 5914
5523static void 5915ecb_cold static void
5524assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5916assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5525{ 5917{
5526 pointer x = mk_symbol (SCHEME_A_ name); 5918 pointer x = mk_symbol (SCHEME_A_ name);
5527 pointer y = mk_proc (SCHEME_A_ op); 5919 pointer y = mk_proc (SCHEME_A_ op);
5528 new_slot_in_env (SCHEME_A_ x, y); 5920 new_slot_in_env (SCHEME_A_ x, y);
… …
5531static pointer 5923static pointer
5532mk_proc (SCHEME_P_ enum scheme_opcodes op) 5924mk_proc (SCHEME_P_ enum scheme_opcodes op)
5533{ 5925{
5534 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5926 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5535 set_typeflag (y, (T_PROC | T_ATOM)); 5927 set_typeflag (y, (T_PROC | T_ATOM));
5536 ivalue_unchecked (y) = op; 5928 set_ivalue (y, op);
5537 return y; 5929 return y;
5538} 5930}
5539 5931
5540/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5932/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5541static int 5933ecb_hot static int
5542syntaxnum (pointer p) 5934syntaxnum (pointer p)
5543{ 5935{
5544 const char *s = strvalue (p); 5936 const char *s = strvalue (p);
5545 5937
5546 switch (strlength (p)) 5938 switch (strlength (p))
… …
5625 6017
5626ecb_cold int 6018ecb_cold int
5627scheme_init (SCHEME_P) 6019scheme_init (SCHEME_P)
5628{ 6020{
5629 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 6021 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5630 pointer x; 6022
6023 /* this memset is not strictly correct, as we assume (intcache)
6024 * that memset 0 will also set pointers to 0, but memset does
6025 * of course not guarantee that. screw such systems.
6026 */
6027 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5631 6028
5632 num_set_fixnum (num_zero, 1); 6029 num_set_fixnum (num_zero, 1);
5633 num_set_ivalue (num_zero, 0); 6030 num_set_ivalue (num_zero, 0);
5634 num_set_fixnum (num_one, 1); 6031 num_set_fixnum (num_one, 1);
5635 num_set_ivalue (num_one, 1); 6032 num_set_ivalue (num_one, 1);
… …
5647 SCHEME_V->save_inport = NIL; 6044 SCHEME_V->save_inport = NIL;
5648 SCHEME_V->loadport = NIL; 6045 SCHEME_V->loadport = NIL;
5649 SCHEME_V->nesting = 0; 6046 SCHEME_V->nesting = 0;
5650 SCHEME_V->interactive_repl = 0; 6047 SCHEME_V->interactive_repl = 0;
5651 6048
5652 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 6049 if (!alloc_cellseg (SCHEME_A))
5653 { 6050 {
5654#if USE_ERROR_CHECKING 6051#if USE_ERROR_CHECKING
5655 SCHEME_V->no_memory = 1; 6052 SCHEME_V->no_memory = 1;
5656 return 0; 6053 return 0;
5657#endif 6054#endif
5658 } 6055 }
5659 6056
5660 SCHEME_V->gc_verbose = 0; 6057 SCHEME_V->gc_verbose = 0;
5661 dump_stack_initialize (SCHEME_A); 6058 dump_stack_initialize (SCHEME_A);
5662 SCHEME_V->code = NIL; 6059 SCHEME_V->code = NIL;
5663 SCHEME_V->args = NIL; 6060 SCHEME_V->args = NIL;
5664 SCHEME_V->envir = NIL; 6061 SCHEME_V->envir = NIL;
6062 SCHEME_V->value = NIL;
5665 SCHEME_V->tracing = 0; 6063 SCHEME_V->tracing = 0;
5666 6064
5667 /* init NIL */ 6065 /* init NIL */
5668 set_typeflag (NIL, T_ATOM | T_MARK); 6066 set_typeflag (NIL, T_SPECIAL | T_ATOM);
5669 set_car (NIL, NIL); 6067 set_car (NIL, NIL);
5670 set_cdr (NIL, NIL); 6068 set_cdr (NIL, NIL);
5671 /* init T */ 6069 /* init T */
5672 set_typeflag (S_T, T_ATOM | T_MARK); 6070 set_typeflag (S_T, T_SPECIAL | T_ATOM);
5673 set_car (S_T, S_T); 6071 set_car (S_T, S_T);
5674 set_cdr (S_T, S_T); 6072 set_cdr (S_T, S_T);
5675 /* init F */ 6073 /* init F */
5676 set_typeflag (S_F, T_ATOM | T_MARK); 6074 set_typeflag (S_F, T_SPECIAL | T_ATOM);
5677 set_car (S_F, S_F); 6075 set_car (S_F, S_F);
5678 set_cdr (S_F, S_F); 6076 set_cdr (S_F, S_F);
5679 /* init EOF_OBJ */ 6077 /* init EOF_OBJ */
5680 set_typeflag (S_EOF, T_ATOM | T_MARK); 6078 set_typeflag (S_EOF, T_SPECIAL | T_ATOM);
5681 set_car (S_EOF, S_EOF); 6079 set_car (S_EOF, S_EOF);
5682 set_cdr (S_EOF, S_EOF); 6080 set_cdr (S_EOF, S_EOF);
5683 /* init sink */ 6081 /* init sink */
5684 set_typeflag (S_SINK, T_PAIR | T_MARK); 6082 set_typeflag (S_SINK, T_PAIR);
5685 set_car (S_SINK, NIL); 6083 set_car (S_SINK, NIL);
5686 6084
5687 /* init c_nest */ 6085 /* init c_nest */
5688 SCHEME_V->c_nest = NIL; 6086 SCHEME_V->c_nest = NIL;
5689 6087
5690 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 6088 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5691 /* init global_env */ 6089 /* init global_env */
5692 new_frame_in_env (SCHEME_A_ NIL); 6090 new_frame_in_env (SCHEME_A_ NIL);
5693 SCHEME_V->global_env = SCHEME_V->envir; 6091 SCHEME_V->global_env = SCHEME_V->envir;
5694 /* init else */ 6092 /* init else */
5695 x = mk_symbol (SCHEME_A_ "else"); 6093 new_slot_in_env (SCHEME_A_ mk_symbol (SCHEME_A_ "else"), S_T);
5696 new_slot_in_env (SCHEME_A_ x, S_T);
5697 6094
5698 { 6095 {
5699 static const char *syntax_names[] = { 6096 static const char *syntax_names[] = {
5700 "lambda", "quote", "define", "if", "begin", "set!", 6097 "lambda", "quote", "define", "if", "begin", "set!",
5701 "let", "let*", "letrec", "cond", "delay", "and", 6098 "let", "let*", "letrec", "cond", "delay", "and",
… …
5725 6122
5726 return !SCHEME_V->no_memory; 6123 return !SCHEME_V->no_memory;
5727} 6124}
5728 6125
5729#if USE_PORTS 6126#if USE_PORTS
5730void 6127ecb_cold void
5731scheme_set_input_port_file (SCHEME_P_ int fin) 6128scheme_set_input_port_file (SCHEME_P_ int fin)
5732{ 6129{
5733 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6130 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5734} 6131}
5735 6132
5736void 6133ecb_cold void
5737scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 6134scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5738{ 6135{
5739 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 6136 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5740} 6137}
5741 6138
5742void 6139ecb_cold void
5743scheme_set_output_port_file (SCHEME_P_ int fout) 6140scheme_set_output_port_file (SCHEME_P_ int fout)
5744{ 6141{
5745 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6142 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5746} 6143}
5747 6144
5748void 6145ecb_cold void
5749scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 6146scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5750{ 6147{
5751 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 6148 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5752} 6149}
5753#endif 6150#endif
5754 6151
5755void 6152ecb_cold void
5756scheme_set_external_data (SCHEME_P_ void *p) 6153scheme_set_external_data (SCHEME_P_ void *p)
5757{ 6154{
5758 SCHEME_V->ext_data = p; 6155 SCHEME_V->ext_data = p;
5759} 6156}
5760 6157
… …
5792 SCHEME_V->loadport = NIL; 6189 SCHEME_V->loadport = NIL;
5793 SCHEME_V->gc_verbose = 0; 6190 SCHEME_V->gc_verbose = 0;
5794 gc (SCHEME_A_ NIL, NIL); 6191 gc (SCHEME_A_ NIL, NIL);
5795 6192
5796 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6193 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5797 free (SCHEME_V->alloc_seg[i]); 6194 free (SCHEME_V->cell_seg[i]);
5798 6195
5799#if SHOW_ERROR_LINE 6196#if SHOW_ERROR_LINE
5800 for (i = 0; i <= SCHEME_V->file_i; i++) 6197 for (i = 0; i <= SCHEME_V->file_i; i++)
5801 {
5802 if (SCHEME_V->load_stack[i].kind & port_file) 6198 if (SCHEME_V->load_stack[i].kind & port_file)
5803 { 6199 {
5804 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6200 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5805 6201
5806 if (fname) 6202 if (fname)
5807 free (fname); 6203 free (fname);
5808 } 6204 }
5809 }
5810#endif 6205#endif
5811} 6206}
5812 6207
5813void 6208ecb_cold void
5814scheme_load_file (SCHEME_P_ int fin) 6209scheme_load_file (SCHEME_P_ int fin)
5815{ 6210{
5816 scheme_load_named_file (SCHEME_A_ fin, 0); 6211 scheme_load_named_file (SCHEME_A_ fin, 0);
5817} 6212}
5818 6213
5819void 6214ecb_cold void
5820scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6215scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5821{ 6216{
5822 dump_stack_reset (SCHEME_A); 6217 dump_stack_reset (SCHEME_A);
5823 SCHEME_V->envir = SCHEME_V->global_env; 6218 SCHEME_V->envir = SCHEME_V->global_env;
5824 SCHEME_V->file_i = 0; 6219 SCHEME_V->file_i = 0;
5825 SCHEME_V->load_stack[0].unget = -1; 6220 SCHEME_V->load_stack[0].unget = -1;
5826 SCHEME_V->load_stack[0].kind = port_input | port_file; 6221 SCHEME_V->load_stack[0].kind = port_input | port_file;
5827 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6222 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5828#if USE_PORTS
5829 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6223 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5830#endif
5831 SCHEME_V->retcode = 0; 6224 SCHEME_V->retcode = 0;
5832 6225
5833#if USE_PORTS
5834 if (fin == STDIN_FILENO) 6226 if (fin == STDIN_FILENO)
5835 SCHEME_V->interactive_repl = 1; 6227 SCHEME_V->interactive_repl = 1;
5836#endif
5837 6228
5838#if USE_PORTS 6229#if USE_PORTS
5839#if SHOW_ERROR_LINE 6230#if SHOW_ERROR_LINE
5840 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6231 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5841 6232
… …
5845#endif 6236#endif
5846 6237
5847 SCHEME_V->inport = SCHEME_V->loadport; 6238 SCHEME_V->inport = SCHEME_V->loadport;
5848 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6239 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5849 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6240 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6241
5850 set_typeflag (SCHEME_V->loadport, T_ATOM); 6242 set_typeflag (SCHEME_V->loadport, T_ATOM);
5851 6243
5852 if (SCHEME_V->retcode == 0) 6244 if (SCHEME_V->retcode == 0)
5853 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6245 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5854} 6246}
5855 6247
5856void 6248ecb_cold void
5857scheme_load_string (SCHEME_P_ const char *cmd) 6249scheme_load_string (SCHEME_P_ const char *cmd)
5858{ 6250{
6251#if USE_PORTs
5859 dump_stack_reset (SCHEME_A); 6252 dump_stack_reset (SCHEME_A);
5860 SCHEME_V->envir = SCHEME_V->global_env; 6253 SCHEME_V->envir = SCHEME_V->global_env;
5861 SCHEME_V->file_i = 0; 6254 SCHEME_V->file_i = 0;
5862 SCHEME_V->load_stack[0].kind = port_input | port_string; 6255 SCHEME_V->load_stack[0].kind = port_input | port_string;
5863 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */ 6256 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5864 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd); 6257 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5865 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 6258 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5866#if USE_PORTS
5867 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6259 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5868#endif
5869 SCHEME_V->retcode = 0; 6260 SCHEME_V->retcode = 0;
5870 SCHEME_V->interactive_repl = 0; 6261 SCHEME_V->interactive_repl = 0;
5871 SCHEME_V->inport = SCHEME_V->loadport; 6262 SCHEME_V->inport = SCHEME_V->loadport;
5872 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6263 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5873 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6264 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5874 set_typeflag (SCHEME_V->loadport, T_ATOM); 6265 set_typeflag (SCHEME_V->loadport, T_ATOM);
5875 6266
5876 if (SCHEME_V->retcode == 0) 6267 if (SCHEME_V->retcode == 0)
5877 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6268 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6269#else
6270 abort ();
6271#endif
5878} 6272}
5879 6273
5880void 6274ecb_cold void
5881scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6275scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5882{ 6276{
5883 pointer x; 6277 pointer x;
5884 6278
5885 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6279 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5890 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6284 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5891} 6285}
5892 6286
5893#if !STANDALONE 6287#if !STANDALONE
5894 6288
5895void 6289ecb_cold void
5896scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6290scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5897{ 6291{
5898 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6292 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5899} 6293}
5900 6294
5901void 6295ecb_cold void
5902scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6296scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5903{ 6297{
5904 int i; 6298 int i;
5905 6299
5906 for (i = 0; i < count; i++) 6300 for (i = 0; i < count; i++)
5907 scheme_register_foreign_func (SCHEME_A_ list + i); 6301 scheme_register_foreign_func (SCHEME_A_ list + i);
5908} 6302}
5909 6303
5910pointer 6304ecb_cold pointer
5911scheme_apply0 (SCHEME_P_ const char *procname) 6305scheme_apply0 (SCHEME_P_ const char *procname)
5912{ 6306{
5913 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6307 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5914} 6308}
5915 6309
5916void 6310ecb_cold void
5917save_from_C_call (SCHEME_P) 6311save_from_C_call (SCHEME_P)
5918{ 6312{
5919 pointer saved_data = cons (car (S_SINK), 6313 pointer saved_data = cons (car (S_SINK),
5920 cons (SCHEME_V->envir, 6314 cons (SCHEME_V->envir,
5921 SCHEME_V->dump)); 6315 SCHEME_V->dump));
… …
5925 /* Truncate the dump stack so TS will return here when done, not 6319 /* Truncate the dump stack so TS will return here when done, not
5926 directly resume pre-C-call operations. */ 6320 directly resume pre-C-call operations. */
5927 dump_stack_reset (SCHEME_A); 6321 dump_stack_reset (SCHEME_A);
5928} 6322}
5929 6323
5930void 6324ecb_cold void
5931restore_from_C_call (SCHEME_P) 6325restore_from_C_call (SCHEME_P)
5932{ 6326{
5933 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6327 set_car (S_SINK, caar (SCHEME_V->c_nest));
5934 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6328 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5935 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6329 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5936 /* Pop */ 6330 /* Pop */
5937 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6331 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5938} 6332}
5939 6333
5940/* "func" and "args" are assumed to be already eval'ed. */ 6334/* "func" and "args" are assumed to be already eval'ed. */
5941pointer 6335ecb_cold pointer
5942scheme_call (SCHEME_P_ pointer func, pointer args) 6336scheme_call (SCHEME_P_ pointer func, pointer args)
5943{ 6337{
5944 int old_repl = SCHEME_V->interactive_repl; 6338 int old_repl = SCHEME_V->interactive_repl;
5945 6339
5946 SCHEME_V->interactive_repl = 0; 6340 SCHEME_V->interactive_repl = 0;
… …
5953 SCHEME_V->interactive_repl = old_repl; 6347 SCHEME_V->interactive_repl = old_repl;
5954 restore_from_C_call (SCHEME_A); 6348 restore_from_C_call (SCHEME_A);
5955 return SCHEME_V->value; 6349 return SCHEME_V->value;
5956} 6350}
5957 6351
5958pointer 6352ecb_cold pointer
5959scheme_eval (SCHEME_P_ pointer obj) 6353scheme_eval (SCHEME_P_ pointer obj)
5960{ 6354{
5961 int old_repl = SCHEME_V->interactive_repl; 6355 int old_repl = SCHEME_V->interactive_repl;
5962 6356
5963 SCHEME_V->interactive_repl = 0; 6357 SCHEME_V->interactive_repl = 0;
… …
5975 6369
5976/* ========== Main ========== */ 6370/* ========== Main ========== */
5977 6371
5978#if STANDALONE 6372#if STANDALONE
5979 6373
5980int 6374ecb_cold int
5981main (int argc, char **argv) 6375main (int argc, char **argv)
5982{ 6376{
5983# if USE_MULTIPLICITY 6377# if USE_MULTIPLICITY
5984 scheme ssc; 6378 scheme ssc;
5985 scheme *const SCHEME_V = &ssc; 6379 scheme *const SCHEME_V = &ssc;
… …
5987# endif 6381# endif
5988 int fin; 6382 int fin;
5989 char *file_name = InitFile; 6383 char *file_name = InitFile;
5990 int retcode; 6384 int retcode;
5991 int isfile = 1; 6385 int isfile = 1;
6386#if EXPERIMENT
5992 system ("ps v $PPID");//D 6387 system ("ps v $PPID");
6388#endif
5993 6389
5994 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6390 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5995 { 6391 {
5996 xwrstr ("Usage: tinyscheme -?\n"); 6392 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5997 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6393 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5998 xwrstr ("followed by\n"); 6394 putstr (SCHEME_A_ "followed by\n");
5999 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6395 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6000 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6396 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6001 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6397 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6002 xwrstr ("Use - as filename for stdin.\n"); 6398 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6003 return 1; 6399 return 1;
6004 } 6400 }
6005 6401
6006 if (!scheme_init (SCHEME_A)) 6402 if (!scheme_init (SCHEME_A))
6007 { 6403 {
6008 xwrstr ("Could not initialize!\n"); 6404 putstr (SCHEME_A_ "Could not initialize!\n");
6009 return 2; 6405 return 2;
6010 } 6406 }
6011 6407
6012# if USE_PORTS 6408# if USE_PORTS
6013 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6409 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6026 } 6422 }
6027#endif 6423#endif
6028 6424
6029 do 6425 do
6030 { 6426 {
6031#if USE_PORTS
6032 if (strcmp (file_name, "-") == 0) 6427 if (strcmp (file_name, "-") == 0)
6033 fin = STDIN_FILENO; 6428 fin = STDIN_FILENO;
6034 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6429 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
6035 { 6430 {
6036 pointer args = NIL; 6431 pointer args = NIL;
… …
6054 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6449 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
6055 6450
6056 } 6451 }
6057 else 6452 else
6058 fin = open (file_name, O_RDONLY); 6453 fin = open (file_name, O_RDONLY);
6059#endif
6060 6454
6061 if (isfile && fin < 0) 6455 if (isfile && fin < 0)
6062 { 6456 {
6063 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6457 putstr (SCHEME_A_ "Could not open file ");
6458 putstr (SCHEME_A_ file_name);
6459 putcharacter (SCHEME_A_ '\n');
6064 } 6460 }
6065 else 6461 else
6066 { 6462 {
6067 if (isfile) 6463 if (isfile)
6068 scheme_load_named_file (SCHEME_A_ fin, file_name); 6464 scheme_load_named_file (SCHEME_A_ fin, file_name);
6069 else 6465 else
6070 scheme_load_string (SCHEME_A_ file_name); 6466 scheme_load_string (SCHEME_A_ file_name);
6071 6467
6072#if USE_PORTS
6073 if (!isfile || fin != STDIN_FILENO) 6468 if (!isfile || fin != STDIN_FILENO)
6074 { 6469 {
6075 if (SCHEME_V->retcode != 0) 6470 if (SCHEME_V->retcode != 0)
6076 { 6471 {
6077 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6472 putstr (SCHEME_A_ "Errors encountered reading ");
6473 putstr (SCHEME_A_ file_name);
6474 putcharacter (SCHEME_A_ '\n');
6078 } 6475 }
6079 6476
6080 if (isfile) 6477 if (isfile)
6081 close (fin); 6478 close (fin);
6082 } 6479 }
6083#endif
6084 } 6480 }
6085 6481
6086 file_name = *argv++; 6482 file_name = *argv++;
6087 } 6483 }
6088 while (file_name != 0); 6484 while (file_name != 0);

Diff Legend

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