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.26 by root, Sat Nov 28 05:12:53 2015 UTC vs.
Revision 1.65 by root, Wed Dec 2 17:01:51 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>
38 40
41#if !USE_ERROR_CHECKING
42# define NDEBUG
43#endif
44
45#include <assert.h>
46#include <stdlib.h>
39#include <string.h> 47#include <string.h>
40#include <stdlib.h>
41 48
42#include <limits.h> 49#include <limits.h>
43#include <inttypes.h> 50#include <inttypes.h>
44#include <float.h> 51#include <float.h>
45//#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
60
61#if '1' != '0' + 1 \
62 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
63 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
64 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
65 || 'f' != 'a' + 5
66# error "execution character set digits not consecutive"
67#endif
46 68
47enum { 69enum {
48 TOK_EOF, 70 TOK_EOF,
49 TOK_LPAREN, 71 TOK_LPAREN,
50 TOK_RPAREN, 72 TOK_RPAREN,
51 TOK_DOT, 73 TOK_DOT,
52 TOK_ATOM, 74 TOK_ATOM,
75 TOK_DOTATOM, /* atom name starting with '.' */
76 TOK_STRATOM, /* atom name enclosed in | */
53 TOK_QUOTE, 77 TOK_QUOTE,
54 TOK_DQUOTE, 78 TOK_DQUOTE,
55 TOK_BQUOTE, 79 TOK_BQUOTE,
56 TOK_COMMA, 80 TOK_COMMA,
57 TOK_ATMARK, 81 TOK_ATMARK,
… …
59 TOK_SHARP_CONST, 83 TOK_SHARP_CONST,
60 TOK_VEC 84 TOK_VEC
61}; 85};
62 86
63#define BACKQUOTE '`' 87#define BACKQUOTE '`'
64#define DELIMITERS "()\";\f\t\v\n\r " 88#define WHITESPACE " \t\r\n\v\f"
89#define DELIMITERS "()\";" WHITESPACE
65 90
66#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 91#define NIL POINTER (&SCHEME_V->xNIL)
67#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 92#define S_T POINTER (&SCHEME_V->xT)
68#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 93#define S_F POINTER (&SCHEME_V->xF)
69#define S_SINK (&SCHEME_V->xsink) 94#define S_SINK POINTER (&SCHEME_V->xsink)
70#define S_EOF (&SCHEME_V->xEOF_OBJ) 95#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
71 96
72#if !USE_MULTIPLICITY 97#if !USE_MULTIPLICITY
73static scheme sc; 98static scheme sc;
74#endif 99#endif
75 100
76static void 101ecb_cold static void
77xbase (char *s, long n, int base) 102xbase (char *s, long n, int base)
78{ 103{
79 if (n < 0) 104 if (n < 0)
80 { 105 {
81 *s++ = '-'; 106 *s++ = '-';
… …
83 } 108 }
84 109
85 char *p = s; 110 char *p = s;
86 111
87 do { 112 do {
88 *p++ = '0' + n % base; 113 *p++ = "0123456789abcdef"[n % base];
89 n /= base; 114 n /= base;
90 } while (n); 115 } while (n);
91 116
92 *p-- = 0; 117 *p-- = 0;
93 118
… …
96 char x = *s; *s = *p; *p = x; 121 char x = *s; *s = *p; *p = x;
97 --p; ++s; 122 --p; ++s;
98 } 123 }
99} 124}
100 125
101static void 126ecb_cold static void
102xnum (char *s, long n) 127xnum (char *s, long n)
103{ 128{
104 xbase (s, n, 10); 129 xbase (s, n, 10);
105} 130}
106 131
107static void 132ecb_cold static void
108xwrstr (const char *s) 133putnum (SCHEME_P_ long n)
109{
110 write (1, s, strlen (s));
111}
112
113static void
114xwrnum (long n)
115{ 134{
116 char buf[64]; 135 char buf[64];
117 136
118 xnum (buf, n); 137 xnum (buf, n);
119 xwrstr (buf); 138 putstr (SCHEME_A_ buf);
120} 139}
140
141#if USE_CHAR_CLASSIFIERS
142#include <ctype.h>
143#else
121 144
122static char 145static char
123xtoupper (char c) 146xtoupper (char c)
124{ 147{
125 if (c >= 'a' && c <= 'z') 148 if (c >= 'a' && c <= 'z')
… …
145 168
146#define toupper(c) xtoupper (c) 169#define toupper(c) xtoupper (c)
147#define tolower(c) xtolower (c) 170#define tolower(c) xtolower (c)
148#define isdigit(c) xisdigit (c) 171#define isdigit(c) xisdigit (c)
149 172
173#endif
174
150#if USE_IGNORECASE 175#if USE_IGNORECASE
151static const char * 176ecb_cold static const char *
152xstrlwr (char *s) 177xstrlwr (char *s)
153{ 178{
154 const char *p = s; 179 const char *p = s;
155 180
156 while (*s) 181 while (*s)
… …
169# define stricmp(a,b) strcmp (a, b) 194# define stricmp(a,b) strcmp (a, b)
170# define strlwr(s) (s) 195# define strlwr(s) (s)
171#endif 196#endif
172 197
173#ifndef prompt 198#ifndef prompt
174# define prompt "ts> " 199# define prompt "ms> "
175#endif 200#endif
176 201
177#ifndef InitFile 202#ifndef InitFile
178# define InitFile "init.scm" 203# define InitFile "init.scm"
179#endif 204#endif
180 205
181#ifndef FIRST_CELLSEGS
182# define FIRST_CELLSEGS 3
183#endif
184
185enum scheme_types 206enum scheme_types
186{ 207{
187 T_INTEGER, 208 T_INTEGER,
209 T_CHARACTER,
188 T_REAL, 210 T_REAL,
189 T_STRING, 211 T_STRING,
190 T_SYMBOL, 212 T_SYMBOL,
191 T_PROC, 213 T_PROC,
192 T_PAIR, /* also used for free cells */ 214 T_PAIR, /* also used for free cells */
193 T_CLOSURE, 215 T_CLOSURE,
216 T_BYTECODE, // temp
217 T_MACRO,
194 T_CONTINUATION, 218 T_CONTINUATION,
195 T_FOREIGN, 219 T_FOREIGN,
196 T_CHARACTER,
197 T_PORT, 220 T_PORT,
198 T_VECTOR, 221 T_VECTOR,
199 T_MACRO,
200 T_PROMISE, 222 T_PROMISE,
201 T_ENVIRONMENT, 223 T_ENVIRONMENT,
202 /* one more... */ 224
203 T_NUM_SYSTEM_TYPES 225 T_NUM_SYSTEM_TYPES
204}; 226};
205 227
206#define T_MASKTYPE 0x000f 228#define T_MASKTYPE 0x000f
207#define T_SYNTAX 0x0010 229#define T_SYNTAX 0x0010
… …
240static num num_op (enum num_op op, num a, num b); 262static num num_op (enum num_op op, num a, num b);
241static num num_intdiv (num a, num b); 263static num num_intdiv (num a, num b);
242static num num_rem (num a, num b); 264static num num_rem (num a, num b);
243static num num_mod (num a, num b); 265static num num_mod (num a, num b);
244 266
245#if USE_MATH
246static double round_per_R5RS (double x);
247#endif
248static int is_zero_rvalue (RVALUE x); 267static int is_zero_rvalue (RVALUE x);
249 268
250static num num_zero; 269static num num_zero;
251static num num_one; 270static num num_one;
252 271
272/* convert "pointer" to cell* / cell* to pointer */
273#define CELL(p) ((struct cell *)(p) + 0)
274#define POINTER(c) ((void *)((c) - 0))
275
253/* macros for cell operations */ 276/* macros for cell operations */
254#define typeflag(p) ((p)->flag + 0) 277#define typeflag(p) (CELL(p)->flag + 0)
255#define set_typeflag(p,v) ((p)->flag = (v)) 278#define set_typeflag(p,v) (CELL(p)->flag = (v))
256#define type(p) (typeflag (p) & T_MASKTYPE) 279#define type(p) (typeflag (p) & T_MASKTYPE)
257 280
258INTERFACE int 281INTERFACE int
259is_string (pointer p) 282is_string (pointer p)
260{ 283{
261 return type (p) == T_STRING; 284 return type (p) == T_STRING;
262} 285}
263 286
264#define strvalue(p) ((p)->object.string.svalue) 287#define strvalue(p) (CELL(p)->object.string.svalue)
265#define strlength(p) ((p)->object.string.length) 288#define strlength(p) (CELL(p)->object.string.length)
266 289
267INTERFACE int 290INTERFACE int
268is_vector (pointer p) 291is_vector (pointer p)
269{ 292{
270 return type (p) == T_VECTOR; 293 return type (p) == T_VECTOR;
271} 294}
272 295
273#define vecvalue(p) ((p)->object.vector.vvalue) 296#define vecvalue(p) (CELL(p)->object.vector.vvalue)
274#define veclength(p) ((p)->object.vector.length) 297#define veclength(p) (CELL(p)->object.vector.length)
275INTERFACE void fill_vector (pointer vec, pointer obj); 298INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
276INTERFACE uint32_t vector_length (pointer vec);
277INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 299INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
278INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 300INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
279
280INTERFACE uint32_t
281vector_length (pointer vec)
282{
283 return vec->object.vector.length;
284}
285 301
286INTERFACE int 302INTERFACE int
287is_integer (pointer p) 303is_integer (pointer p)
288{ 304{
289 return type (p) == T_INTEGER; 305 return type (p) == T_INTEGER;
… …
312string_value (pointer p) 328string_value (pointer p)
313{ 329{
314 return strvalue (p); 330 return strvalue (p);
315} 331}
316 332
317#define ivalue_unchecked(p) (p)->object.ivalue 333#define ivalue_unchecked(p) CELL(p)->object.ivalue
318#define set_ivalue(p,v) (p)->object.ivalue = (v) 334#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
319 335
320#if USE_REAL 336#if USE_REAL
321#define rvalue_unchecked(p) (p)->object.rvalue 337#define rvalue_unchecked(p) CELL(p)->object.rvalue
322#define set_rvalue(p,v) (p)->object.rvalue = (v) 338#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
323#else 339#else
324#define rvalue_unchecked(p) (p)->object.ivalue 340#define rvalue_unchecked(p) CELL(p)->object.ivalue
325#define set_rvalue(p,v) (p)->object.ivalue = (v) 341#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
326#endif 342#endif
327 343
328INTERFACE long 344INTERFACE long
329charvalue (pointer p) 345charvalue (pointer p)
330{ 346{
331 return ivalue_unchecked (p); 347 return ivalue_unchecked (p);
332} 348}
333 349
350#define port(p) CELL(p)->object.port
351#define set_port(p,v) port(p) = (v)
334INTERFACE int 352INTERFACE int
335is_port (pointer p) 353is_port (pointer p)
336{ 354{
337 return type (p) == T_PORT; 355 return type (p) == T_PORT;
338} 356}
339 357
340INTERFACE int 358INTERFACE int
341is_inport (pointer p) 359is_inport (pointer p)
342{ 360{
343 return is_port (p) && p->object.port->kind & port_input; 361 return is_port (p) && port (p)->kind & port_input;
344} 362}
345 363
346INTERFACE int 364INTERFACE int
347is_outport (pointer p) 365is_outport (pointer p)
348{ 366{
349 return is_port (p) && p->object.port->kind & port_output; 367 return is_port (p) && port (p)->kind & port_output;
350} 368}
351 369
352INTERFACE int 370INTERFACE int
353is_pair (pointer p) 371is_pair (pointer p)
354{ 372{
355 return type (p) == T_PAIR; 373 return type (p) == T_PAIR;
356} 374}
357 375
358#define car(p) ((p)->object.cons.car + 0) 376#define car(p) (POINTER (CELL(p)->object.cons.car))
359#define cdr(p) ((p)->object.cons.cdr + 0) 377#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
360 378
361static pointer caar (pointer p) { return car (car (p)); } 379static pointer caar (pointer p) { return car (car (p)); }
362static pointer cadr (pointer p) { return car (cdr (p)); } 380static pointer cadr (pointer p) { return car (cdr (p)); }
363static pointer cdar (pointer p) { return cdr (car (p)); } 381static pointer cdar (pointer p) { return cdr (car (p)); }
364static pointer cddr (pointer p) { return cdr (cdr (p)); } 382static pointer cddr (pointer p) { return cdr (cdr (p)); }
365 383
366static pointer cadar (pointer p) { return car (cdr (car (p))); } 384static pointer cadar (pointer p) { return car (cdr (car (p))); }
367static pointer caddr (pointer p) { return car (cdr (cdr (p))); } 385static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
368static pointer cdaar (pointer p) { return cdr (car (car (p))); } 386static pointer cdaar (pointer p) { return cdr (car (car (p))); }
369 387
388static pointer cadddr (pointer p) { return car (car (car (cdr (p)))); }
389
370INTERFACE void 390INTERFACE void
371set_car (pointer p, pointer q) 391set_car (pointer p, pointer q)
372{ 392{
373 p->object.cons.car = q; 393 CELL(p)->object.cons.car = CELL (q);
374} 394}
375 395
376INTERFACE void 396INTERFACE void
377set_cdr (pointer p, pointer q) 397set_cdr (pointer p, pointer q)
378{ 398{
379 p->object.cons.cdr = q; 399 CELL(p)->object.cons.cdr = CELL (q);
380} 400}
381 401
382INTERFACE pointer 402INTERFACE pointer
383pair_car (pointer p) 403pair_car (pointer p)
384{ 404{
… …
398} 418}
399 419
400INTERFACE char * 420INTERFACE char *
401symname (pointer p) 421symname (pointer p)
402{ 422{
403 return strvalue (car (p)); 423 return strvalue (p);
404} 424}
405 425
406#if USE_PLIST 426#if USE_PLIST
427#error plists are broken because symbols are no longer pairs
428#define symprop(p) cdr(p)
407SCHEME_EXPORT int 429SCHEME_EXPORT int
408hasprop (pointer p) 430hasprop (pointer p)
409{ 431{
410 return typeflag (p) & T_SYMBOL; 432 return typeflag (p) & T_SYMBOL;
411} 433}
412
413# define symprop(p) cdr(p)
414#endif 434#endif
415 435
416INTERFACE int 436INTERFACE int
417is_syntax (pointer p) 437is_syntax (pointer p)
418{ 438{
… …
432} 452}
433 453
434INTERFACE char * 454INTERFACE char *
435syntaxname (pointer p) 455syntaxname (pointer p)
436{ 456{
437 return strvalue (car (p)); 457 return strvalue (p);
438} 458}
439 459
440#define procnum(p) ivalue_unchecked (p) 460#define procnum(p) ivalue_unchecked (p)
441static const char *procname (pointer x); 461static const char *procname (pointer x);
442 462
… …
514 proper list: length 534 proper list: length
515 circular list: -1 535 circular list: -1
516 not even a pair: -2 536 not even a pair: -2
517 dotted list: -2 minus length before dot 537 dotted list: -2 minus length before dot
518*/ 538*/
519INTERFACE int 539ecb_hot INTERFACE int
520list_length (SCHEME_P_ pointer a) 540list_length (SCHEME_P_ pointer a)
521{ 541{
522 int i = 0; 542 int i = 0;
523 pointer slow, fast; 543 pointer slow, fast;
524 544
… …
563{ 583{
564 return list_length (SCHEME_A_ a) >= 0; 584 return list_length (SCHEME_A_ a) >= 0;
565} 585}
566 586
567#if USE_CHAR_CLASSIFIERS 587#if USE_CHAR_CLASSIFIERS
588
568ecb_inline int 589ecb_inline int
569Cisalpha (int c) 590Cisalpha (int c)
570{ 591{
571 return isascii (c) && isalpha (c); 592 return isascii (c) && isalpha (c);
572} 593}
… …
630 "gs", 651 "gs",
631 "rs", 652 "rs",
632 "us" 653 "us"
633}; 654};
634 655
635static int 656ecb_cold static int
636is_ascii_name (const char *name, int *pc) 657is_ascii_name (const char *name, int *pc)
637{ 658{
638 int i; 659 int i;
639 660
640 for (i = 0; i < 32; i++) 661 for (i = 0; i < 32; i++)
… …
658#endif 679#endif
659 680
660static int file_push (SCHEME_P_ const char *fname); 681static int file_push (SCHEME_P_ const char *fname);
661static void file_pop (SCHEME_P); 682static void file_pop (SCHEME_P);
662static int file_interactive (SCHEME_P); 683static int file_interactive (SCHEME_P);
663ecb_inline int is_one_of (char *s, int c); 684ecb_inline int is_one_of (const char *s, int c);
664static int alloc_cellseg (SCHEME_P_ int n); 685static int alloc_cellseg (SCHEME_P);
665ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 686ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
666static void finalize_cell (SCHEME_P_ pointer a); 687static void finalize_cell (SCHEME_P_ pointer a);
667static int count_consecutive_cells (pointer x, int needed);
668static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 688static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
669static pointer mk_number (SCHEME_P_ const num n); 689static pointer mk_number (SCHEME_P_ const num n);
670static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 690static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
671static pointer mk_vector (SCHEME_P_ uint32_t len); 691static pointer mk_vector (SCHEME_P_ uint32_t len);
672static pointer mk_atom (SCHEME_P_ char *q); 692static pointer mk_atom (SCHEME_P_ char *q);
673static pointer mk_sharp_const (SCHEME_P_ char *name); 693static pointer mk_sharp_const (SCHEME_P_ char *name);
674 694
695static pointer mk_port (SCHEME_P_ port *p);
696
675#if USE_PORTS 697#if USE_PORTS
676static pointer mk_port (SCHEME_P_ port *p);
677static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 698static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
678static pointer port_from_file (SCHEME_P_ int, int prop); 699static pointer port_from_file (SCHEME_P_ int, int prop);
679static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 700static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
680static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop); 701static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop);
681static port *port_rep_from_file (SCHEME_P_ int, int prop); 702static port *port_rep_from_file (SCHEME_P_ int, int prop);
682static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 703static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
683static void port_close (SCHEME_P_ pointer p, int flag); 704static void port_close (SCHEME_P_ pointer p, int flag);
684#endif 705#endif
706
685static void mark (pointer a); 707static void mark (pointer a);
686static void gc (SCHEME_P_ pointer a, pointer b); 708static void gc (SCHEME_P_ pointer a, pointer b);
687static int basic_inchar (port *pt); 709static int basic_inchar (port *pt);
688static int inchar (SCHEME_P); 710static int inchar (SCHEME_P);
689static void backchar (SCHEME_P_ int c); 711static void backchar (SCHEME_P_ int c);
690static char *readstr_upto (SCHEME_P_ char *delim); 712static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
691static pointer readstrexp (SCHEME_P); 713static pointer readstrexp (SCHEME_P_ char delim);
692ecb_inline int skipspace (SCHEME_P); 714static int skipspace (SCHEME_P);
693static int token (SCHEME_P); 715static int token (SCHEME_P);
694static void printslashstring (SCHEME_P_ char *s, int len); 716static void printslashstring (SCHEME_P_ char *s, int len);
695static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 717static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
696static void printatom (SCHEME_P_ pointer l, int f); 718static void printatom (SCHEME_P_ pointer l, int f);
697static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 719static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
863 } 885 }
864 886
865 return ret; 887 return ret;
866} 888}
867 889
868#if USE_MATH
869
870/* Round to nearest. Round to even if midway */
871static double
872round_per_R5RS (double x)
873{
874 double fl = floor (x);
875 double ce = ceil (x);
876 double dfl = x - fl;
877 double dce = ce - x;
878
879 if (dfl > dce)
880 return ce;
881 else if (dfl < dce)
882 return fl;
883 else
884 {
885 if (fmod (fl, 2) == 0) /* I imagine this holds */
886 return fl;
887 else
888 return ce;
889 }
890}
891#endif
892
893static int 890static int
894is_zero_rvalue (RVALUE x) 891is_zero_rvalue (RVALUE x)
895{ 892{
896 return x == 0; 893 return x == 0;
897#if 0 894#if 0
… …
902#endif 899#endif
903#endif 900#endif
904} 901}
905 902
906/* allocate new cell segment */ 903/* allocate new cell segment */
907static int 904ecb_cold static int
908alloc_cellseg (SCHEME_P_ int n) 905alloc_cellseg (SCHEME_P)
909{ 906{
910 pointer newp; 907 struct cell *newp;
911 pointer last; 908 struct cell *last;
912 pointer p; 909 struct cell *p;
913 char *cp; 910 char *cp;
914 long i; 911 long i;
915 int k; 912 int k;
916 913
917 static int segsize = CELL_SEGSIZE >> 1; 914 static int segsize = CELL_SEGSIZE >> 1;
918 segsize <<= 1; 915 segsize <<= 1;
919 916
920 for (k = 0; k < n; k++)
921 {
922 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
923 return k;
924
925 cp = malloc (segsize * sizeof (struct cell)); 917 cp = malloc (segsize * sizeof (struct cell));
926 918
927 if (!cp && USE_ERROR_CHECKING) 919 if (!cp && USE_ERROR_CHECKING)
928 return k; 920 return k;
929 921
930 i = ++SCHEME_V->last_cell_seg; 922 i = ++SCHEME_V->last_cell_seg;
931 SCHEME_V->alloc_seg[i] = cp;
932 923
933 /* insert new segment in address order */ 924 newp = (struct cell *)cp;
934 newp = (pointer)cp;
935 SCHEME_V->cell_seg[i] = newp; 925 SCHEME_V->cell_seg[i] = newp;
936 SCHEME_V->cell_segsize[i] = segsize; 926 SCHEME_V->cell_segsize[i] = segsize;
937
938 //TODO: insert, not swap
939 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
940 {
941 p = SCHEME_V->cell_seg[i];
942 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
943 SCHEME_V->cell_seg[i - 1] = p;
944
945 k = SCHEME_V->cell_segsize[i];
946 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
947 SCHEME_V->cell_segsize[i - 1] = k;
948
949 --i;
950 }
951
952 SCHEME_V->fcells += segsize; 927 SCHEME_V->fcells += segsize;
953 last = newp + segsize - 1; 928 last = newp + segsize - 1;
954 929
955 for (p = newp; p <= last; p++) 930 for (p = newp; p <= last; p++)
956 { 931 {
932 pointer cp = POINTER (p);
957 set_typeflag (p, T_PAIR); 933 set_typeflag (cp, T_PAIR);
958 set_car (p, NIL); 934 set_car (cp, NIL);
959 set_cdr (p, p + 1); 935 set_cdr (cp, POINTER (p + 1));
960 } 936 }
961 937
962 /* insert new cells in address order on free list */
963 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
964 {
965 set_cdr (last, SCHEME_V->free_cell); 938 set_cdr (POINTER (last), SCHEME_V->free_cell);
966 SCHEME_V->free_cell = newp; 939 SCHEME_V->free_cell = POINTER (newp);
967 }
968 else
969 {
970 p = SCHEME_V->free_cell;
971 940
972 while (cdr (p) != NIL && newp > cdr (p))
973 p = cdr (p);
974
975 set_cdr (last, cdr (p));
976 set_cdr (p, newp);
977 }
978 }
979
980 return n; 941 return 1;
981} 942}
982 943
983/* get new cell. parameter a, b is marked by gc. */ 944/* get new cell. parameter a, b is marked by gc. */
984ecb_inline pointer 945ecb_inline pointer
985get_cell_x (SCHEME_P_ pointer a, pointer b) 946get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
989 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 950 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
990 return S_SINK; 951 return S_SINK;
991 952
992 if (SCHEME_V->free_cell == NIL) 953 if (SCHEME_V->free_cell == NIL)
993 { 954 {
994 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 955 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
995 956
996 gc (SCHEME_A_ a, b); 957 gc (SCHEME_A_ a, b);
997 958
998 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 959 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
999 { 960 {
1000 /* if only a few recovered, get more to avoid fruitless gc's */ 961 /* if only a few recovered, get more to avoid fruitless gc's */
1001 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 962 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
1002 { 963 {
1003#if USE_ERROR_CHECKING 964#if USE_ERROR_CHECKING
1004 SCHEME_V->no_memory = 1; 965 SCHEME_V->no_memory = 1;
1005 return S_SINK; 966 return S_SINK;
1006#endif 967#endif
… …
1018 } 979 }
1019} 980}
1020 981
1021/* To retain recent allocs before interpreter knows about them - 982/* To retain recent allocs before interpreter knows about them -
1022 Tehom */ 983 Tehom */
1023 984ecb_hot static void
1024static void
1025push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 985push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1026{ 986{
1027 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 987 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1028 988
1029 set_typeflag (holder, T_PAIR); 989 set_typeflag (holder, T_PAIR);
… …
1031 set_car (holder, recent); 991 set_car (holder, recent);
1032 set_cdr (holder, car (S_SINK)); 992 set_cdr (holder, car (S_SINK));
1033 set_car (S_SINK, holder); 993 set_car (S_SINK, holder);
1034} 994}
1035 995
1036static pointer 996ecb_hot static pointer
1037get_cell (SCHEME_P_ pointer a, pointer b) 997get_cell (SCHEME_P_ pointer a, pointer b)
1038{ 998{
1039 pointer cell = get_cell_x (SCHEME_A_ a, b); 999 pointer cell = get_cell_x (SCHEME_A_ a, b);
1040 1000
1041 /* For right now, include "a" and "b" in "cell" so that gc doesn't 1001 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
1050} 1010}
1051 1011
1052static pointer 1012static pointer
1053get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1013get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1054{ 1014{
1055 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1015 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1056 pointer *e = malloc (len * sizeof (pointer)); 1016 pointer *e = malloc (len * sizeof (pointer));
1057 1017
1058 if (!e && USE_ERROR_CHECKING) 1018 if (!e && USE_ERROR_CHECKING)
1059 return S_SINK; 1019 return S_SINK;
1060 1020
1061 /* Record it as a vector so that gc understands it. */ 1021 /* Record it as a vector so that gc understands it. */
1062 set_typeflag (v, T_VECTOR | T_ATOM); 1022 set_typeflag (v, T_VECTOR | T_ATOM);
1063 1023
1064 v->object.vector.vvalue = e; 1024 CELL(v)->object.vector.vvalue = e;
1065 v->object.vector.length = len; 1025 CELL(v)->object.vector.length = len;
1066 fill_vector (v, init); 1026 fill_vector (v, 0, init);
1067 push_recent_alloc (SCHEME_A_ v, NIL); 1027 push_recent_alloc (SCHEME_A_ v, NIL);
1068 1028
1069 return v; 1029 return v;
1070} 1030}
1071 1031
… …
1079static void 1039static void
1080check_cell_alloced (pointer p, int expect_alloced) 1040check_cell_alloced (pointer p, int expect_alloced)
1081{ 1041{
1082 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1042 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1083 if (typeflag (p) & !expect_alloced) 1043 if (typeflag (p) & !expect_alloced)
1084 xwrstr ("Cell is already allocated!\n"); 1044 putstr (SCHEME_A_ "Cell is already allocated!\n");
1085 1045
1086 if (!(typeflag (p)) & expect_alloced) 1046 if (!(typeflag (p)) & expect_alloced)
1087 xwrstr ("Cell is not allocated!\n"); 1047 putstr (SCHEME_A_ "Cell is not allocated!\n");
1088} 1048}
1089 1049
1090static void 1050static void
1091check_range_alloced (pointer p, int n, int expect_alloced) 1051check_range_alloced (pointer p, int n, int expect_alloced)
1092{ 1052{
… …
1098#endif 1058#endif
1099 1059
1100/* Medium level cell allocation */ 1060/* Medium level cell allocation */
1101 1061
1102/* get new cons cell */ 1062/* get new cons cell */
1103pointer 1063ecb_hot static pointer
1104xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1064xcons (SCHEME_P_ pointer a, pointer b)
1105{ 1065{
1106 pointer x = get_cell (SCHEME_A_ a, b); 1066 pointer x = get_cell (SCHEME_A_ a, b);
1107 1067
1108 set_typeflag (x, T_PAIR); 1068 set_typeflag (x, T_PAIR);
1109
1110 if (immutable)
1111 setimmutable (x);
1112 1069
1113 set_car (x, a); 1070 set_car (x, a);
1114 set_cdr (x, b); 1071 set_cdr (x, b);
1115 1072
1116 return x; 1073 return x;
1117} 1074}
1118 1075
1076ecb_hot static pointer
1077ximmutable_cons (SCHEME_P_ pointer a, pointer b)
1078{
1079 pointer x = xcons (SCHEME_A_ a, b);
1080 setimmutable (x);
1081 return x;
1082}
1083
1084#define cons(a,b) xcons (SCHEME_A_ a, b)
1085#define immutable_cons(a,b) ximmutable_cons (SCHEME_A_ a, b)
1086
1087ecb_cold static pointer
1088generate_symbol (SCHEME_P_ const char *name)
1089{
1090 pointer x = mk_string (SCHEME_A_ name);
1091 setimmutable (x);
1092 set_typeflag (x, T_SYMBOL | T_ATOM);
1093 return x;
1094}
1095
1119/* ========== oblist implementation ========== */ 1096/* ========== oblist implementation ========== */
1120 1097
1121#ifndef USE_OBJECT_LIST 1098#ifndef USE_OBJECT_LIST
1122 1099
1100static int
1123static int hash_fn (const char *key, int table_size); 1101hash_fn (const char *key, int table_size)
1102{
1103 const unsigned char *p = (unsigned char *)key;
1104 uint32_t hash = 2166136261U;
1124 1105
1106 while (*p)
1107 hash = (hash ^ *p++) * 16777619;
1108
1109 return hash % table_size;
1110}
1111
1125static pointer 1112ecb_cold static pointer
1126oblist_initial_value (SCHEME_P) 1113oblist_initial_value (SCHEME_P)
1127{ 1114{
1128 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1115 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1129} 1116}
1130 1117
1131/* returns the new symbol */ 1118/* returns the new symbol */
1132static pointer 1119ecb_cold static pointer
1133oblist_add_by_name (SCHEME_P_ const char *name) 1120oblist_add_by_name (SCHEME_P_ const char *name)
1134{ 1121{
1135 int location; 1122 pointer x = generate_symbol (SCHEME_A_ name);
1136
1137 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1138 set_typeflag (x, T_SYMBOL);
1139 setimmutable (car (x));
1140
1141 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1123 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1142 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1124 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1143 return x; 1125 return x;
1144} 1126}
1145 1127
1146ecb_inline pointer 1128ecb_cold static pointer
1147oblist_find_by_name (SCHEME_P_ const char *name) 1129oblist_find_by_name (SCHEME_P_ const char *name)
1148{ 1130{
1149 int location; 1131 int location;
1150 pointer x; 1132 pointer x;
1151 char *s; 1133 char *s;
1152 1134
1153 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1135 location = hash_fn (name, veclength (SCHEME_V->oblist));
1154 1136
1155 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1137 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1156 { 1138 {
1157 s = symname (car (x)); 1139 s = symname (car (x));
1158 1140
1159 /* case-insensitive, per R5RS section 2 */ 1141 /* case-insensitive, per R5RS section 2 */
1160 if (stricmp (name, s) == 0) 1142 if (stricmp (name, s) == 0)
… …
1162 } 1144 }
1163 1145
1164 return NIL; 1146 return NIL;
1165} 1147}
1166 1148
1167static pointer 1149ecb_cold static pointer
1168oblist_all_symbols (SCHEME_P) 1150oblist_all_symbols (SCHEME_P)
1169{ 1151{
1170 int i; 1152 int i;
1171 pointer x; 1153 pointer x;
1172 pointer ob_list = NIL; 1154 pointer ob_list = NIL;
1173 1155
1174 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1156 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1175 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1157 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1176 ob_list = cons (x, ob_list); 1158 ob_list = cons (x, ob_list);
1177 1159
1178 return ob_list; 1160 return ob_list;
1179} 1161}
1180 1162
1181#else 1163#else
1182 1164
1183static pointer 1165ecb_cold static pointer
1184oblist_initial_value (SCHEME_P) 1166oblist_initial_value (SCHEME_P)
1185{ 1167{
1186 return NIL; 1168 return NIL;
1187} 1169}
1188 1170
1189ecb_inline pointer 1171ecb_cold static pointer
1190oblist_find_by_name (SCHEME_P_ const char *name) 1172oblist_find_by_name (SCHEME_P_ const char *name)
1191{ 1173{
1192 pointer x; 1174 pointer x;
1193 char *s; 1175 char *s;
1194 1176
… …
1203 1185
1204 return NIL; 1186 return NIL;
1205} 1187}
1206 1188
1207/* returns the new symbol */ 1189/* returns the new symbol */
1208static pointer 1190ecb_cold static pointer
1209oblist_add_by_name (SCHEME_P_ const char *name) 1191oblist_add_by_name (SCHEME_P_ const char *name)
1210{ 1192{
1211 pointer x; 1193 pointer x = generate_symbol (SCHEME_A_ name);
1212
1213 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1214 set_typeflag (x, T_SYMBOL);
1215 setimmutable (car (x));
1216 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1194 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1217 return x; 1195 return x;
1218} 1196}
1219 1197
1220static pointer 1198ecb_cold static pointer
1221oblist_all_symbols (SCHEME_P) 1199oblist_all_symbols (SCHEME_P)
1222{ 1200{
1223 return SCHEME_V->oblist; 1201 return SCHEME_V->oblist;
1224} 1202}
1225 1203
1226#endif 1204#endif
1227 1205
1228#if USE_PORTS
1229static pointer 1206ecb_cold static pointer
1230mk_port (SCHEME_P_ port *p) 1207mk_port (SCHEME_P_ port *p)
1231{ 1208{
1232 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1209 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1233 1210
1234 set_typeflag (x, T_PORT | T_ATOM); 1211 set_typeflag (x, T_PORT | T_ATOM);
1235 x->object.port = p; 1212 set_port (x, p);
1236 1213
1237 return x; 1214 return x;
1238} 1215}
1239#endif
1240 1216
1241pointer 1217ecb_cold pointer
1242mk_foreign_func (SCHEME_P_ foreign_func f) 1218mk_foreign_func (SCHEME_P_ foreign_func f)
1243{ 1219{
1244 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1220 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1245 1221
1246 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1222 set_typeflag (x, T_FOREIGN | T_ATOM);
1247 x->object.ff = f; 1223 CELL(x)->object.ff = f;
1248 1224
1249 return x; 1225 return x;
1250} 1226}
1251 1227
1252INTERFACE pointer 1228INTERFACE pointer
1253mk_character (SCHEME_P_ int c) 1229mk_character (SCHEME_P_ int c)
1254{ 1230{
1255 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1231 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1256 1232
1257 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1233 set_typeflag (x, T_CHARACTER | T_ATOM);
1258 set_ivalue (x, c & 0xff); 1234 set_ivalue (x, c & 0xff);
1259 1235
1260 return x; 1236 return x;
1261} 1237}
1262 1238
1263/* get number atom (integer) */ 1239/* get number atom (integer) */
1264INTERFACE pointer 1240INTERFACE pointer
1265mk_integer (SCHEME_P_ long n) 1241mk_integer (SCHEME_P_ long n)
1266{ 1242{
1243 pointer p = 0;
1244 pointer *pp = &p;
1245
1246#if USE_INTCACHE
1247 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1248 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1249#endif
1250
1251 if (!*pp)
1252 {
1267 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1253 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1268 1254
1269 set_typeflag (x, (T_INTEGER | T_ATOM)); 1255 set_typeflag (x, T_INTEGER | T_ATOM);
1256 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1270 set_ivalue (x, n); 1257 set_ivalue (x, n);
1271 1258
1259 *pp = x;
1260 }
1261
1272 return x; 1262 return *pp;
1273} 1263}
1274 1264
1275INTERFACE pointer 1265INTERFACE pointer
1276mk_real (SCHEME_P_ RVALUE n) 1266mk_real (SCHEME_P_ RVALUE n)
1277{ 1267{
1278#if USE_REAL 1268#if USE_REAL
1279 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1269 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1280 1270
1281 set_typeflag (x, (T_REAL | T_ATOM)); 1271 set_typeflag (x, T_REAL | T_ATOM);
1282 set_rvalue (x, n); 1272 set_rvalue (x, n);
1283 1273
1284 return x; 1274 return x;
1285#else 1275#else
1286 return mk_integer (SCHEME_A_ n); 1276 return mk_integer (SCHEME_A_ n);
… …
1310 SCHEME_V->no_memory = 1; 1300 SCHEME_V->no_memory = 1;
1311 return SCHEME_V->strbuff; 1301 return SCHEME_V->strbuff;
1312 } 1302 }
1313 1303
1314 if (str) 1304 if (str)
1315 { 1305 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1316 int l = strlen (str);
1317
1318 if (l > len_str)
1319 l = len_str;
1320
1321 memcpy (q, str, l);
1322 q[l] = 0;
1323 }
1324 else 1306 else
1325 {
1326 memset (q, fill, len_str); 1307 memset (q, fill, len_str);
1308
1327 q[len_str] = 0; 1309 q[len_str] = 0;
1328 }
1329 1310
1330 return q; 1311 return q;
1331} 1312}
1332 1313
1333INTERFACE pointer 1314INTERFACE pointer
… …
1347 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1328 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1348 1329
1349 set_typeflag (x, T_STRING | T_ATOM); 1330 set_typeflag (x, T_STRING | T_ATOM);
1350 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1331 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1351 strlength (x) = len; 1332 strlength (x) = len;
1333
1352 return x; 1334 return x;
1353} 1335}
1354 1336
1355INTERFACE pointer 1337INTERFACE pointer
1356mk_string (SCHEME_P_ const char *str) 1338mk_string (SCHEME_P_ const char *str)
… …
1363{ 1345{
1364 return get_vector_object (SCHEME_A_ len, NIL); 1346 return get_vector_object (SCHEME_A_ len, NIL);
1365} 1347}
1366 1348
1367INTERFACE void 1349INTERFACE void
1368fill_vector (pointer vec, pointer obj) 1350fill_vector (pointer vec, uint32_t start, pointer obj)
1369{ 1351{
1370 int i; 1352 int i;
1371 1353
1372 for (i = 0; i < vec->object.vector.length; i++) 1354 for (i = start; i < veclength (vec); i++)
1373 vecvalue (vec)[i] = obj; 1355 vecvalue (vec)[i] = obj;
1374} 1356}
1375 1357
1358INTERFACE void
1359vector_resize (pointer vec, uint32_t newsize, pointer fill)
1360{
1361 uint32_t oldsize = veclength (vec);
1362 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1363 veclength (vec) = newsize;
1364 fill_vector (vec, oldsize, fill);
1365}
1366
1376INTERFACE pointer 1367INTERFACE pointer
1377vector_elem (pointer vec, uint32_t ielem) 1368vector_get (pointer vec, uint32_t ielem)
1378{ 1369{
1379 return vecvalue(vec)[ielem]; 1370 return vecvalue(vec)[ielem];
1380} 1371}
1381 1372
1382INTERFACE void 1373INTERFACE void
1383set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1374vector_set (pointer vec, uint32_t ielem, pointer a)
1384{ 1375{
1385 vecvalue(vec)[ielem] = a; 1376 vecvalue(vec)[ielem] = a;
1386} 1377}
1387 1378
1388/* get new symbol */ 1379/* get new symbol */
… …
1396 x = oblist_add_by_name (SCHEME_A_ name); 1387 x = oblist_add_by_name (SCHEME_A_ name);
1397 1388
1398 return x; 1389 return x;
1399} 1390}
1400 1391
1401INTERFACE pointer 1392ecb_cold INTERFACE pointer
1402gensym (SCHEME_P) 1393gensym (SCHEME_P)
1403{ 1394{
1404 pointer x; 1395 pointer x;
1405
1406 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1407 {
1408 char name[40] = "gensym-"; 1396 char name[40] = "gensym-";
1409 xnum (name + 7, SCHEME_V->gensym_cnt); 1397 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1410 1398
1411 /* first check oblist */ 1399 return generate_symbol (SCHEME_A_ name);
1412 x = oblist_find_by_name (SCHEME_A_ name); 1400}
1413 1401
1414 if (x == NIL) 1402static int
1415 { 1403is_gensym (SCHEME_P_ pointer x)
1416 x = oblist_add_by_name (SCHEME_A_ name); 1404{
1417 return x; 1405 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1418 }
1419 }
1420
1421 return NIL;
1422} 1406}
1423 1407
1424/* make symbol or number atom from string */ 1408/* make symbol or number atom from string */
1425static pointer 1409ecb_cold static pointer
1426mk_atom (SCHEME_P_ char *q) 1410mk_atom (SCHEME_P_ char *q)
1427{ 1411{
1428 char c, *p; 1412 char c, *p;
1429 int has_dec_point = 0; 1413 int has_dec_point = 0;
1430 int has_fp_exp = 0; 1414 int has_fp_exp = 0;
… …
1501 1485
1502 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1486 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1503} 1487}
1504 1488
1505/* make constant */ 1489/* make constant */
1506static pointer 1490ecb_cold static pointer
1507mk_sharp_const (SCHEME_P_ char *name) 1491mk_sharp_const (SCHEME_P_ char *name)
1508{ 1492{
1509 if (!strcmp (name, "t")) 1493 if (!strcmp (name, "t"))
1510 return S_T; 1494 return S_T;
1511 else if (!strcmp (name, "f")) 1495 else if (!strcmp (name, "f"))
1512 return S_F; 1496 return S_F;
1513 else if (*name == '\\') /* #\w (character) */ 1497 else if (*name == '\\') /* #\w (character) */
1514 { 1498 {
1515 int c; 1499 int c;
1516 1500
1501 // TODO: optimise
1517 if (stricmp (name + 1, "space") == 0) 1502 if (stricmp (name + 1, "space") == 0)
1518 c = ' '; 1503 c = ' ';
1519 else if (stricmp (name + 1, "newline") == 0) 1504 else if (stricmp (name + 1, "newline") == 0)
1520 c = '\n'; 1505 c = '\n';
1521 else if (stricmp (name + 1, "return") == 0) 1506 else if (stricmp (name + 1, "return") == 0)
1522 c = '\r'; 1507 c = '\r';
1523 else if (stricmp (name + 1, "tab") == 0) 1508 else if (stricmp (name + 1, "tab") == 0)
1524 c = '\t'; 1509 c = '\t';
1510 else if (stricmp (name + 1, "alarm") == 0)
1511 c = 0x07;
1512 else if (stricmp (name + 1, "backspace") == 0)
1513 c = 0x08;
1514 else if (stricmp (name + 1, "escape") == 0)
1515 c = 0x1b;
1516 else if (stricmp (name + 1, "delete") == 0)
1517 c = 0x7f;
1518 else if (stricmp (name + 1, "null") == 0)
1519 c = 0;
1525 else if (name[1] == 'x' && name[2] != 0) 1520 else if (name[1] == 'x' && name[2] != 0)
1526 { 1521 {
1527 long c1 = strtol (name + 2, 0, 16); 1522 long c1 = strtol (name + 2, 0, 16);
1528 1523
1529 if (0 <= c1 && c1 <= UCHAR_MAX) 1524 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1554 return NIL; 1549 return NIL;
1555 } 1550 }
1556} 1551}
1557 1552
1558/* ========== garbage collector ========== */ 1553/* ========== garbage collector ========== */
1554
1555static void
1556finalize_cell (SCHEME_P_ pointer a)
1557{
1558 /* TODO, fast bitmap check? */
1559 if (is_string (a) || is_symbol (a))
1560 free (strvalue (a));
1561 else if (is_vector (a))
1562 free (vecvalue (a));
1563#if USE_PORTS
1564 else if (is_port (a))
1565 {
1566 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1567 port_close (SCHEME_A_ a, port_input | port_output);
1568
1569 free (port (a));
1570 }
1571#endif
1572}
1559 1573
1560/*-- 1574/*--
1561 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1575 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1562 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1576 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1563 * for marking. 1577 * for marking.
1564 * 1578 *
1565 * The exception is vectors - vectors are currently marked recursively, 1579 * The exception is vectors - vectors are currently marked recursively,
1566 * which is inherited form tinyscheme and could be fixed by having another 1580 * which is inherited form tinyscheme and could be fixed by having another
1567 * word of context in the vector 1581 * word of context in the vector
1568 */ 1582 */
1569static void 1583ecb_hot static void
1570mark (pointer a) 1584mark (pointer a)
1571{ 1585{
1572 pointer t, q, p; 1586 pointer t, q, p;
1573 1587
1574 t = 0; 1588 t = 0;
… …
1578 1592
1579 if (ecb_expect_false (is_vector (p))) 1593 if (ecb_expect_false (is_vector (p)))
1580 { 1594 {
1581 int i; 1595 int i;
1582 1596
1583 for (i = 0; i < p->object.vector.length; i++) 1597 for (i = 0; i < veclength (p); i++)
1584 mark (vecvalue (p)[i]); 1598 mark (vecvalue (p)[i]);
1585 } 1599 }
1586 1600
1587 if (is_atom (p)) 1601 if (is_atom (p))
1588 goto E6; 1602 goto E6;
… …
1631 p = q; 1645 p = q;
1632 goto E6; 1646 goto E6;
1633 } 1647 }
1634} 1648}
1635 1649
1650ecb_hot static void
1651gc_free (SCHEME_P)
1652{
1653 int i;
1654 uint32_t total = 0;
1655
1656 /* Here we scan the cells to build the free-list. */
1657 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1658 {
1659 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1660 struct cell *p;
1661 total += SCHEME_V->cell_segsize [i];
1662
1663 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1664 {
1665 pointer c = POINTER (p);
1666
1667 if (is_mark (c))
1668 clrmark (c);
1669 else
1670 {
1671 /* reclaim cell */
1672 if (typeflag (c) != T_PAIR)
1673 {
1674 finalize_cell (SCHEME_A_ c);
1675 set_typeflag (c, T_PAIR);
1676 set_car (c, NIL);
1677 }
1678
1679 ++SCHEME_V->fcells;
1680 set_cdr (c, SCHEME_V->free_cell);
1681 SCHEME_V->free_cell = c;
1682 }
1683 }
1684 }
1685
1686 if (SCHEME_V->gc_verbose)
1687 {
1688 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");
1689 }
1690}
1691
1636/* garbage collection. parameter a, b is marked. */ 1692/* garbage collection. parameter a, b is marked. */
1637static void 1693ecb_cold static void
1638gc (SCHEME_P_ pointer a, pointer b) 1694gc (SCHEME_P_ pointer a, pointer b)
1639{ 1695{
1640 pointer p;
1641 int i; 1696 int i;
1642 1697
1643 if (SCHEME_V->gc_verbose) 1698 if (SCHEME_V->gc_verbose)
1644 putstr (SCHEME_A_ "gc..."); 1699 putstr (SCHEME_A_ "gc...");
1645 1700
… …
1661 /* Mark recent objects the interpreter doesn't know about yet. */ 1716 /* Mark recent objects the interpreter doesn't know about yet. */
1662 mark (car (S_SINK)); 1717 mark (car (S_SINK));
1663 /* Mark any older stuff above nested C calls */ 1718 /* Mark any older stuff above nested C calls */
1664 mark (SCHEME_V->c_nest); 1719 mark (SCHEME_V->c_nest);
1665 1720
1721#if USE_INTCACHE
1722 /* mark intcache */
1723 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1724 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1725 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1726#endif
1727
1666 /* mark variables a, b */ 1728 /* mark variables a, b */
1667 mark (a); 1729 mark (a);
1668 mark (b); 1730 mark (b);
1669 1731
1670 /* garbage collect */ 1732 /* garbage collect */
1671 clrmark (NIL); 1733 clrmark (NIL);
1672 SCHEME_V->fcells = 0; 1734 SCHEME_V->fcells = 0;
1673 SCHEME_V->free_cell = NIL; 1735 SCHEME_V->free_cell = NIL;
1674 1736
1675 /* free-list is kept sorted by address so as to maintain consecutive
1676 ranges, if possible, for use with vectors. Here we scan the cells
1677 (which are also kept sorted by address) downwards to build the
1678 free-list in sorted order.
1679 */
1680 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1681 {
1682 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1683
1684 while (--p >= SCHEME_V->cell_seg[i])
1685 {
1686 if (is_mark (p))
1687 clrmark (p);
1688 else
1689 {
1690 /* reclaim cell */
1691 if (typeflag (p) != T_PAIR)
1692 {
1693 finalize_cell (SCHEME_A_ p);
1694 set_typeflag (p, T_PAIR);
1695 set_car (p, NIL);
1696 }
1697
1698 ++SCHEME_V->fcells;
1699 set_cdr (p, SCHEME_V->free_cell);
1700 SCHEME_V->free_cell = p;
1701 }
1702 }
1703 }
1704
1705 if (SCHEME_V->gc_verbose) 1737 if (SCHEME_V->gc_verbose)
1706 { 1738 putstr (SCHEME_A_ "freeing...");
1707 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1708 }
1709}
1710 1739
1711static void 1740 gc_free (SCHEME_A);
1712finalize_cell (SCHEME_P_ pointer a)
1713{
1714 /* TODO, fast bitmap check? */
1715 if (is_string (a))
1716 free (strvalue (a));
1717 else if (is_vector (a))
1718 free (vecvalue (a));
1719#if USE_PORTS
1720 else if (is_port (a))
1721 {
1722 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1723 port_close (SCHEME_A_ a, port_input | port_output);
1724
1725 free (a->object.port);
1726 }
1727#endif
1728} 1741}
1729 1742
1730/* ========== Routines for Reading ========== */ 1743/* ========== Routines for Reading ========== */
1731 1744
1732static int 1745ecb_cold static int
1733file_push (SCHEME_P_ const char *fname) 1746file_push (SCHEME_P_ const char *fname)
1734{ 1747{
1735#if USE_PORTS
1736 int fin; 1748 int fin;
1737 1749
1738 if (SCHEME_V->file_i == MAXFIL - 1) 1750 if (SCHEME_V->file_i == MAXFIL - 1)
1739 return 0; 1751 return 0;
1740 1752
… …
1746 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1758 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1747 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1759 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1748 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1760 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1749 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1761 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1750 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1762 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1751 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1763 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1752 1764
1753#if SHOW_ERROR_LINE 1765#if SHOW_ERROR_LINE
1754 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1766 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1755 1767
1756 if (fname) 1768 if (fname)
1757 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0); 1769 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0);
1758#endif 1770#endif
1759 } 1771 }
1760 1772
1761 return fin >= 0; 1773 return fin >= 0;
1762
1763#else
1764 return 1;
1765#endif
1766} 1774}
1767 1775
1768static void 1776ecb_cold static void
1769file_pop (SCHEME_P) 1777file_pop (SCHEME_P)
1770{ 1778{
1771 if (SCHEME_V->file_i != 0) 1779 if (SCHEME_V->file_i != 0)
1772 { 1780 {
1773 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1781 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1774#if USE_PORTS 1782#if USE_PORTS
1775 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1783 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1776#endif 1784#endif
1777 SCHEME_V->file_i--; 1785 SCHEME_V->file_i--;
1778 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1786 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1779 } 1787 }
1780} 1788}
1781 1789
1782static int 1790ecb_cold static int
1783file_interactive (SCHEME_P) 1791file_interactive (SCHEME_P)
1784{ 1792{
1785#if USE_PORTS 1793#if USE_PORTS
1786 return SCHEME_V->file_i == 0 1794 return SCHEME_V->file_i == 0
1787 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1795 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1788 && (SCHEME_V->inport->object.port->kind & port_file); 1796 && (port (SCHEME_V->inport)->kind & port_file);
1789#else 1797#else
1790 return 0; 1798 return 0;
1791#endif 1799#endif
1792} 1800}
1793 1801
1794#if USE_PORTS 1802#if USE_PORTS
1795static port * 1803ecb_cold static port *
1796port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1804port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1797{ 1805{
1798 int fd; 1806 int fd;
1799 int flags; 1807 int flags;
1800 char *rw; 1808 char *rw;
… …
1823# endif 1831# endif
1824 1832
1825 return pt; 1833 return pt;
1826} 1834}
1827 1835
1828static pointer 1836ecb_cold static pointer
1829port_from_filename (SCHEME_P_ const char *fn, int prop) 1837port_from_filename (SCHEME_P_ const char *fn, int prop)
1830{ 1838{
1831 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1839 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1832 1840
1833 if (!pt && USE_ERROR_CHECKING) 1841 if (!pt && USE_ERROR_CHECKING)
1834 return NIL; 1842 return NIL;
1835 1843
1836 return mk_port (SCHEME_A_ pt); 1844 return mk_port (SCHEME_A_ pt);
1837} 1845}
1838 1846
1839static port * 1847ecb_cold static port *
1840port_rep_from_file (SCHEME_P_ int f, int prop) 1848port_rep_from_file (SCHEME_P_ int f, int prop)
1841{ 1849{
1842 port *pt = malloc (sizeof *pt); 1850 port *pt = malloc (sizeof *pt);
1843 1851
1844 if (!pt && USE_ERROR_CHECKING) 1852 if (!pt && USE_ERROR_CHECKING)
… …
1849 pt->rep.stdio.file = f; 1857 pt->rep.stdio.file = f;
1850 pt->rep.stdio.closeit = 0; 1858 pt->rep.stdio.closeit = 0;
1851 return pt; 1859 return pt;
1852} 1860}
1853 1861
1854static pointer 1862ecb_cold static pointer
1855port_from_file (SCHEME_P_ int f, int prop) 1863port_from_file (SCHEME_P_ int f, int prop)
1856{ 1864{
1857 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1865 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1858 1866
1859 if (!pt && USE_ERROR_CHECKING) 1867 if (!pt && USE_ERROR_CHECKING)
1860 return NIL; 1868 return NIL;
1861 1869
1862 return mk_port (SCHEME_A_ pt); 1870 return mk_port (SCHEME_A_ pt);
1863} 1871}
1864 1872
1865static port * 1873ecb_cold static port *
1866port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1874port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1867{ 1875{
1868 port *pt = malloc (sizeof (port)); 1876 port *pt = malloc (sizeof (port));
1869 1877
1870 if (!pt && USE_ERROR_CHECKING) 1878 if (!pt && USE_ERROR_CHECKING)
… …
1876 pt->rep.string.curr = start; 1884 pt->rep.string.curr = start;
1877 pt->rep.string.past_the_end = past_the_end; 1885 pt->rep.string.past_the_end = past_the_end;
1878 return pt; 1886 return pt;
1879} 1887}
1880 1888
1881static pointer 1889ecb_cold static pointer
1882port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1890port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1883{ 1891{
1884 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1892 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1885 1893
1886 if (!pt && USE_ERROR_CHECKING) 1894 if (!pt && USE_ERROR_CHECKING)
… …
1889 return mk_port (SCHEME_A_ pt); 1897 return mk_port (SCHEME_A_ pt);
1890} 1898}
1891 1899
1892# define BLOCK_SIZE 256 1900# define BLOCK_SIZE 256
1893 1901
1894static port * 1902ecb_cold static port *
1895port_rep_from_scratch (SCHEME_P) 1903port_rep_from_scratch (SCHEME_P)
1896{ 1904{
1897 char *start; 1905 char *start;
1898 port *pt = malloc (sizeof (port)); 1906 port *pt = malloc (sizeof (port));
1899 1907
… …
1913 pt->rep.string.curr = start; 1921 pt->rep.string.curr = start;
1914 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1922 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1915 return pt; 1923 return pt;
1916} 1924}
1917 1925
1918static pointer 1926ecb_cold static pointer
1919port_from_scratch (SCHEME_P) 1927port_from_scratch (SCHEME_P)
1920{ 1928{
1921 port *pt = port_rep_from_scratch (SCHEME_A); 1929 port *pt = port_rep_from_scratch (SCHEME_A);
1922 1930
1923 if (!pt && USE_ERROR_CHECKING) 1931 if (!pt && USE_ERROR_CHECKING)
1924 return NIL; 1932 return NIL;
1925 1933
1926 return mk_port (SCHEME_A_ pt); 1934 return mk_port (SCHEME_A_ pt);
1927} 1935}
1928 1936
1929static void 1937ecb_cold static void
1930port_close (SCHEME_P_ pointer p, int flag) 1938port_close (SCHEME_P_ pointer p, int flag)
1931{ 1939{
1932 port *pt = p->object.port; 1940 port *pt = port (p);
1933 1941
1934 pt->kind &= ~flag; 1942 pt->kind &= ~flag;
1935 1943
1936 if ((pt->kind & (port_input | port_output)) == 0) 1944 if ((pt->kind & (port_input | port_output)) == 0)
1937 { 1945 {
… …
1954 } 1962 }
1955} 1963}
1956#endif 1964#endif
1957 1965
1958/* get new character from input file */ 1966/* get new character from input file */
1959static int 1967ecb_cold static int
1960inchar (SCHEME_P) 1968inchar (SCHEME_P)
1961{ 1969{
1962 int c; 1970 int c;
1963 port *pt; 1971 port *pt = port (SCHEME_V->inport);
1964
1965 pt = SCHEME_V->inport->object.port;
1966 1972
1967 if (pt->kind & port_saw_EOF) 1973 if (pt->kind & port_saw_EOF)
1968 return EOF; 1974 return EOF;
1969 1975
1970 c = basic_inchar (pt); 1976 c = basic_inchar (pt);
… …
1980 } 1986 }
1981 1987
1982 return c; 1988 return c;
1983} 1989}
1984 1990
1985static int ungot = -1; 1991ecb_cold static int
1986
1987static int
1988basic_inchar (port *pt) 1992basic_inchar (port *pt)
1989{ 1993{
1990#if USE_PORTS
1991 if (pt->unget != -1) 1994 if (pt->unget != -1)
1992 { 1995 {
1993 int r = pt->unget; 1996 int r = pt->unget;
1994 pt->unget = -1; 1997 pt->unget = -1;
1995 return r; 1998 return r;
1996 } 1999 }
1997 2000
2001#if USE_PORTS
1998 if (pt->kind & port_file) 2002 if (pt->kind & port_file)
1999 { 2003 {
2000 char c; 2004 char c;
2001 2005
2002 if (!read (pt->rep.stdio.file, &c, 1)) 2006 if (!read (pt->rep.stdio.file, &c, 1))
… …
2010 return EOF; 2014 return EOF;
2011 else 2015 else
2012 return *pt->rep.string.curr++; 2016 return *pt->rep.string.curr++;
2013 } 2017 }
2014#else 2018#else
2015 if (ungot == -1)
2016 {
2017 char c; 2019 char c;
2018 if (!read (0, &c, 1)) 2020
2021 if (!read (pt->rep.stdio.file, &c, 1))
2019 return EOF; 2022 return EOF;
2020 2023
2021 ungot = c;
2022 }
2023
2024 {
2025 int r = ungot;
2026 ungot = -1;
2027 return r; 2024 return c;
2028 }
2029#endif 2025#endif
2030} 2026}
2031 2027
2032/* back character to input buffer */ 2028/* back character to input buffer */
2033static void 2029ecb_cold static void
2034backchar (SCHEME_P_ int c) 2030backchar (SCHEME_P_ int c)
2035{ 2031{
2036#if USE_PORTS 2032 port *pt = port (SCHEME_V->inport);
2037 port *pt;
2038 2033
2039 if (c == EOF) 2034 if (c == EOF)
2040 return; 2035 return;
2041 2036
2042 pt = SCHEME_V->inport->object.port;
2043 pt->unget = c; 2037 pt->unget = c;
2044#else
2045 if (c == EOF)
2046 return;
2047
2048 ungot = c;
2049#endif
2050} 2038}
2051 2039
2052#if USE_PORTS 2040#if USE_PORTS
2053static int 2041ecb_cold static int
2054realloc_port_string (SCHEME_P_ port *p) 2042realloc_port_string (SCHEME_P_ port *p)
2055{ 2043{
2056 char *start = p->rep.string.start; 2044 char *start = p->rep.string.start;
2057 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2045 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
2058 char *str = malloc (new_size); 2046 char *str = malloc (new_size);
… …
2071 else 2059 else
2072 return 0; 2060 return 0;
2073} 2061}
2074#endif 2062#endif
2075 2063
2076INTERFACE void 2064ecb_cold static void
2077putstr (SCHEME_P_ const char *s) 2065putchars (SCHEME_P_ const char *s, int len)
2078{ 2066{
2067 port *pt = port (SCHEME_V->outport);
2068
2079#if USE_PORTS 2069#if USE_PORTS
2080 port *pt = SCHEME_V->outport->object.port;
2081
2082 if (pt->kind & port_file)
2083 write (pt->rep.stdio.file, s, strlen (s));
2084 else
2085 for (; *s; s++)
2086 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2087 *pt->rep.string.curr++ = *s;
2088 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2089 *pt->rep.string.curr++ = *s;
2090
2091#else
2092 xwrstr (s);
2093#endif
2094}
2095
2096static void
2097putchars (SCHEME_P_ const char *s, int len)
2098{
2099#if USE_PORTS
2100 port *pt = SCHEME_V->outport->object.port;
2101
2102 if (pt->kind & port_file) 2070 if (pt->kind & port_file)
2103 write (pt->rep.stdio.file, s, len); 2071 write (pt->rep.stdio.file, s, len);
2104 else 2072 else
2105 { 2073 {
2106 for (; len; len--) 2074 for (; len; len--)
… …
2111 *pt->rep.string.curr++ = *s++; 2079 *pt->rep.string.curr++ = *s++;
2112 } 2080 }
2113 } 2081 }
2114 2082
2115#else 2083#else
2116 write (1, s, len); 2084 write (1, s, len); // output not initialised
2117#endif 2085#endif
2086}
2087
2088INTERFACE void
2089putstr (SCHEME_P_ const char *s)
2090{
2091 putchars (SCHEME_A_ s, strlen (s));
2118} 2092}
2119 2093
2120INTERFACE void 2094INTERFACE void
2121putcharacter (SCHEME_P_ int c) 2095putcharacter (SCHEME_P_ int c)
2122{ 2096{
2123#if USE_PORTS
2124 port *pt = SCHEME_V->outport->object.port;
2125
2126 if (pt->kind & port_file)
2127 {
2128 char cc = c;
2129 write (pt->rep.stdio.file, &cc, 1);
2130 }
2131 else
2132 {
2133 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2134 *pt->rep.string.curr++ = c;
2135 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2136 *pt->rep.string.curr++ = c;
2137 }
2138
2139#else
2140 char cc = c; 2097 char cc = c;
2141 write (1, &c, 1); 2098
2142#endif 2099 putchars (SCHEME_A_ &cc, 1);
2143} 2100}
2144 2101
2145/* read characters up to delimiter, but cater to character constants */ 2102/* read characters up to delimiter, but cater to character constants */
2146static char * 2103ecb_cold static char *
2147readstr_upto (SCHEME_P_ char *delim) 2104readstr_upto (SCHEME_P_ int skip, const char *delim)
2148{ 2105{
2149 char *p = SCHEME_V->strbuff; 2106 char *p = SCHEME_V->strbuff + skip;
2150 2107
2151 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2108 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2152 2109
2153 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2110 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2154 *p = 0; 2111 *p = 0;
… …
2160 2117
2161 return SCHEME_V->strbuff; 2118 return SCHEME_V->strbuff;
2162} 2119}
2163 2120
2164/* read string expression "xxx...xxx" */ 2121/* read string expression "xxx...xxx" */
2165static pointer 2122ecb_cold static pointer
2166readstrexp (SCHEME_P) 2123readstrexp (SCHEME_P_ char delim)
2167{ 2124{
2168 char *p = SCHEME_V->strbuff; 2125 char *p = SCHEME_V->strbuff;
2169 int c; 2126 int c;
2170 int c1 = 0; 2127 int c1 = 0;
2171 enum
2172 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2128 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2173 2129
2174 for (;;) 2130 for (;;)
2175 { 2131 {
2176 c = inchar (SCHEME_A); 2132 c = inchar (SCHEME_A);
2177 2133
… …
2179 return S_F; 2135 return S_F;
2180 2136
2181 switch (state) 2137 switch (state)
2182 { 2138 {
2183 case st_ok: 2139 case st_ok:
2184 switch (c) 2140 if (ecb_expect_false (c == delim))
2185 {
2186 case '\\':
2187 state = st_bsl;
2188 break;
2189
2190 case '"':
2191 *p = 0;
2192 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2141 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2193 2142
2194 default: 2143 if (ecb_expect_false (c == '\\'))
2144 state = st_bsl;
2145 else
2195 *p++ = c; 2146 *p++ = c;
2196 break;
2197 }
2198 2147
2199 break; 2148 break;
2200 2149
2201 case st_bsl: 2150 case st_bsl:
2202 switch (c) 2151 switch (c)
… …
2211 case '7': 2160 case '7':
2212 state = st_oct1; 2161 state = st_oct1;
2213 c1 = c - '0'; 2162 c1 = c - '0';
2214 break; 2163 break;
2215 2164
2165 case 'a': *p++ = '\a'; state = st_ok; break;
2166 case 'n': *p++ = '\n'; state = st_ok; break;
2167 case 'r': *p++ = '\r'; state = st_ok; break;
2168 case 't': *p++ = '\t'; state = st_ok; break;
2169
2170 // this overshoots the minimum requirements of r7rs
2171 case ' ':
2172 case '\t':
2173 case '\r':
2174 case '\n':
2175 skipspace (SCHEME_A);
2176 state = st_ok;
2177 break;
2178
2179 //TODO: x should end in ;, not two-digit hex
2216 case 'x': 2180 case 'x':
2217 case 'X': 2181 case 'X':
2218 state = st_x1; 2182 state = st_x1;
2219 c1 = 0; 2183 c1 = 0;
2220 break; 2184 break;
2221 2185
2222 case 'n':
2223 *p++ = '\n';
2224 state = st_ok;
2225 break;
2226
2227 case 't':
2228 *p++ = '\t';
2229 state = st_ok;
2230 break;
2231
2232 case 'r':
2233 *p++ = '\r';
2234 state = st_ok;
2235 break;
2236
2237 case '"':
2238 *p++ = '"';
2239 state = st_ok;
2240 break;
2241
2242 default: 2186 default:
2243 *p++ = c; 2187 *p++ = c;
2244 state = st_ok; 2188 state = st_ok;
2245 break; 2189 break;
2246 } 2190 }
2247 2191
2248 break; 2192 break;
2249 2193
2250 case st_x1: 2194 case st_x1:
2251 case st_x2: 2195 case st_x2:
2252 c = toupper (c); 2196 c = tolower (c);
2253 2197
2254 if (c >= '0' && c <= 'F') 2198 if (c >= '0' && c <= '9')
2255 {
2256 if (c <= '9')
2257 c1 = (c1 << 4) + c - '0'; 2199 c1 = (c1 << 4) + c - '0';
2258 else 2200 else if (c >= 'a' && c <= 'f')
2259 c1 = (c1 << 4) + c - 'A' + 10; 2201 c1 = (c1 << 4) + c - 'a' + 10;
2260
2261 if (state == st_x1)
2262 state = st_x2;
2263 else
2264 {
2265 *p++ = c1;
2266 state = st_ok;
2267 }
2268 }
2269 else 2202 else
2270 return S_F; 2203 return S_F;
2204
2205 if (state == st_x1)
2206 state = st_x2;
2207 else
2208 {
2209 *p++ = c1;
2210 state = st_ok;
2211 }
2271 2212
2272 break; 2213 break;
2273 2214
2274 case st_oct1: 2215 case st_oct1:
2275 case st_oct2: 2216 case st_oct2:
… …
2279 backchar (SCHEME_A_ c); 2220 backchar (SCHEME_A_ c);
2280 state = st_ok; 2221 state = st_ok;
2281 } 2222 }
2282 else 2223 else
2283 { 2224 {
2284 if (state == st_oct2 && c1 >= 32) 2225 if (state == st_oct2 && c1 >= ' ')
2285 return S_F; 2226 return S_F;
2286 2227
2287 c1 = (c1 << 3) + (c - '0'); 2228 c1 = (c1 << 3) + (c - '0');
2288 2229
2289 if (state == st_oct1) 2230 if (state == st_oct1)
… …
2294 state = st_ok; 2235 state = st_ok;
2295 } 2236 }
2296 } 2237 }
2297 2238
2298 break; 2239 break;
2299
2300 } 2240 }
2301 } 2241 }
2302} 2242}
2303 2243
2304/* check c is in chars */ 2244/* check c is in chars */
2305ecb_inline int 2245ecb_cold int
2306is_one_of (char *s, int c) 2246is_one_of (const char *s, int c)
2307{ 2247{
2308 if (c == EOF)
2309 return 1;
2310
2311 return !!strchr (s, c); 2248 return c == EOF || !!strchr (s, c);
2312} 2249}
2313 2250
2314/* skip white characters */ 2251/* skip white characters */
2315ecb_inline int 2252ecb_cold int
2316skipspace (SCHEME_P) 2253skipspace (SCHEME_P)
2317{ 2254{
2318 int c, curr_line = 0; 2255 int c, curr_line = 0;
2319 2256
2320 do 2257 do
2321 { 2258 {
2322 c = inchar (SCHEME_A); 2259 c = inchar (SCHEME_A);
2260
2323#if SHOW_ERROR_LINE 2261#if SHOW_ERROR_LINE
2324 if (c == '\n') 2262 if (ecb_expect_false (c == '\n'))
2325 curr_line++; 2263 curr_line++;
2326#endif 2264#endif
2265
2266 if (ecb_expect_false (c == EOF))
2267 return c;
2327 } 2268 }
2328 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2269 while (is_one_of (WHITESPACE, c));
2329 2270
2330 /* record it */ 2271 /* record it */
2331#if SHOW_ERROR_LINE 2272#if SHOW_ERROR_LINE
2332 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2273 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2333 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2274 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2334#endif 2275#endif
2335 2276
2336 if (c != EOF)
2337 {
2338 backchar (SCHEME_A_ c); 2277 backchar (SCHEME_A_ c);
2339 return 1; 2278 return 1;
2340 }
2341 else
2342 return EOF;
2343} 2279}
2344 2280
2345/* get token */ 2281/* get token */
2346static int 2282ecb_cold static int
2347token (SCHEME_P) 2283token (SCHEME_P)
2348{ 2284{
2349 int c = skipspace (SCHEME_A); 2285 int c = skipspace (SCHEME_A);
2350 2286
2351 if (c == EOF) 2287 if (c == EOF)
… …
2363 return TOK_RPAREN; 2299 return TOK_RPAREN;
2364 2300
2365 case '.': 2301 case '.':
2366 c = inchar (SCHEME_A); 2302 c = inchar (SCHEME_A);
2367 2303
2368 if (is_one_of (" \n\t", c)) 2304 if (is_one_of (WHITESPACE, c))
2369 return TOK_DOT; 2305 return TOK_DOT;
2370 else 2306 else
2371 { 2307 {
2372 //TODO: ungetc twice in a row is not supported in C
2373 backchar (SCHEME_A_ c); 2308 backchar (SCHEME_A_ c);
2374 backchar (SCHEME_A_ '.');
2375 return TOK_ATOM; 2309 return TOK_DOTATOM;
2376 } 2310 }
2311
2312 case '|':
2313 return TOK_STRATOM;
2377 2314
2378 case '\'': 2315 case '\'':
2379 return TOK_QUOTE; 2316 return TOK_QUOTE;
2380 2317
2381 case ';': 2318 case ';':
… …
2448} 2385}
2449 2386
2450/* ========== Routines for Printing ========== */ 2387/* ========== Routines for Printing ========== */
2451#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2388#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2452 2389
2453static void 2390ecb_cold static void
2454printslashstring (SCHEME_P_ char *p, int len) 2391printslashstring (SCHEME_P_ char *p, int len)
2455{ 2392{
2456 int i; 2393 int i;
2457 unsigned char *s = (unsigned char *) p; 2394 unsigned char *s = (unsigned char *) p;
2458 2395
… …
2513 } 2450 }
2514 2451
2515 putcharacter (SCHEME_A_ '"'); 2452 putcharacter (SCHEME_A_ '"');
2516} 2453}
2517 2454
2518
2519/* print atoms */ 2455/* print atoms */
2520static void 2456ecb_cold static void
2521printatom (SCHEME_P_ pointer l, int f) 2457printatom (SCHEME_P_ pointer l, int f)
2522{ 2458{
2523 char *p; 2459 char *p;
2524 int len; 2460 int len;
2525 2461
2526 atom2str (SCHEME_A_ l, f, &p, &len); 2462 atom2str (SCHEME_A_ l, f, &p, &len);
2527 putchars (SCHEME_A_ p, len); 2463 putchars (SCHEME_A_ p, len);
2528} 2464}
2529 2465
2530
2531/* Uses internal buffer unless string pointer is already available */ 2466/* Uses internal buffer unless string pointer is already available */
2532static void 2467ecb_cold static void
2533atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2468atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2534{ 2469{
2535 char *p; 2470 char *p;
2536 2471
2537 if (l == NIL) 2472 if (l == NIL)
… …
2695#endif 2630#endif
2696 } 2631 }
2697 else if (is_continuation (l)) 2632 else if (is_continuation (l))
2698 p = "#<CONTINUATION>"; 2633 p = "#<CONTINUATION>";
2699 else 2634 else
2635 {
2636#if USE_PRINTF
2637 p = SCHEME_V->strbuff;
2638 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2639#else
2700 p = "#<ERROR>"; 2640 p = "#<ERROR>";
2641#endif
2642 }
2701 2643
2702 *pp = p; 2644 *pp = p;
2703 *plen = strlen (p); 2645 *plen = strlen (p);
2704} 2646}
2705 2647
… …
2737 return car (d); 2679 return car (d);
2738 2680
2739 p = cons (car (d), cdr (d)); 2681 p = cons (car (d), cdr (d));
2740 q = p; 2682 q = p;
2741 2683
2742 while (cdr (cdr (p)) != NIL) 2684 while (cddr (p) != NIL)
2743 { 2685 {
2744 d = cons (car (p), cdr (p)); 2686 d = cons (car (p), cdr (p));
2745 2687
2746 if (cdr (cdr (p)) != NIL) 2688 if (cddr (p) != NIL)
2747 p = cdr (d); 2689 p = cdr (d);
2748 } 2690 }
2749 2691
2750 set_cdr (p, car (cdr (p))); 2692 set_cdr (p, cadr (p));
2751 return q; 2693 return q;
2752} 2694}
2753 2695
2754/* reverse list -- produce new list */ 2696/* reverse list -- produce new list */
2755static pointer 2697ecb_hot static pointer
2756reverse (SCHEME_P_ pointer a) 2698reverse (SCHEME_P_ pointer a)
2757{ 2699{
2758 /* a must be checked by gc */ 2700 /* a must be checked by gc */
2759 pointer p = NIL; 2701 pointer p = NIL;
2760 2702
… …
2763 2705
2764 return p; 2706 return p;
2765} 2707}
2766 2708
2767/* reverse list --- in-place */ 2709/* reverse list --- in-place */
2768static pointer 2710ecb_hot static pointer
2769reverse_in_place (SCHEME_P_ pointer term, pointer list) 2711reverse_in_place (SCHEME_P_ pointer term, pointer list)
2770{ 2712{
2771 pointer result = term; 2713 pointer result = term;
2772 pointer p = list; 2714 pointer p = list;
2773 2715
… …
2781 2723
2782 return result; 2724 return result;
2783} 2725}
2784 2726
2785/* append list -- produce new list (in reverse order) */ 2727/* append list -- produce new list (in reverse order) */
2786static pointer 2728ecb_hot static pointer
2787revappend (SCHEME_P_ pointer a, pointer b) 2729revappend (SCHEME_P_ pointer a, pointer b)
2788{ 2730{
2789 pointer result = a; 2731 pointer result = a;
2790 pointer p = b; 2732 pointer p = b;
2791 2733
… …
2800 2742
2801 return S_F; /* signal an error */ 2743 return S_F; /* signal an error */
2802} 2744}
2803 2745
2804/* equivalence of atoms */ 2746/* equivalence of atoms */
2805int 2747ecb_hot int
2806eqv (pointer a, pointer b) 2748eqv (pointer a, pointer b)
2807{ 2749{
2808 if (is_string (a)) 2750 if (is_string (a))
2809 { 2751 {
2810 if (is_string (b)) 2752 if (is_string (b))
… …
2849/* () is #t in R5RS */ 2791/* () is #t in R5RS */
2850#define is_true(p) ((p) != S_F) 2792#define is_true(p) ((p) != S_F)
2851#define is_false(p) ((p) == S_F) 2793#define is_false(p) ((p) == S_F)
2852 2794
2853/* ========== Environment implementation ========== */ 2795/* ========== Environment implementation ========== */
2854
2855#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2856
2857static int
2858hash_fn (const char *key, int table_size)
2859{
2860 const unsigned char *p = key;
2861 uint32_t hash = 2166136261;
2862
2863 while (*p)
2864 hash = (hash ^ *p++) * 16777619;
2865
2866 return hash % table_size;
2867}
2868#endif
2869 2796
2870#ifndef USE_ALIST_ENV 2797#ifndef USE_ALIST_ENV
2871 2798
2872/* 2799/*
2873 * In this implementation, each frame of the environment may be 2800 * In this implementation, each frame of the environment may be
… …
2890 2817
2891 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2818 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2892 setenvironment (SCHEME_V->envir); 2819 setenvironment (SCHEME_V->envir);
2893} 2820}
2894 2821
2822static uint32_t
2823sym_hash (pointer sym, uint32_t size)
2824{
2825 uintptr_t ptr = (uintptr_t)sym;
2826
2827#if 0
2828 /* table size is prime, so why mix */
2829 ptr += ptr >> 32;
2830 ptr += ptr >> 16;
2831 ptr += ptr >> 8;
2832#endif
2833
2834 return ptr % size;
2835}
2836
2895ecb_inline void 2837ecb_inline void
2896new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2838new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2897{ 2839{
2898 pointer slot = immutable_cons (variable, value); 2840 pointer slot = immutable_cons (variable, value);
2899 2841
2900 if (is_vector (car (env))) 2842 if (is_vector (car (env)))
2901 { 2843 {
2902 int location = hash_fn (symname (variable), veclength (car (env))); 2844 int location = sym_hash (variable, veclength (car (env)));
2903
2904 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2845 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2905 } 2846 }
2906 else 2847 else
2907 set_car (env, immutable_cons (slot, car (env))); 2848 set_car (env, immutable_cons (slot, car (env)));
2908} 2849}
2909 2850
2910static pointer 2851ecb_hot static pointer
2911find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2852find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2912{ 2853{
2913 pointer x, y; 2854 pointer x, y;
2914 int location;
2915 2855
2916 for (x = env; x != NIL; x = cdr (x)) 2856 for (x = env; x != NIL; x = cdr (x))
2917 { 2857 {
2918 if (is_vector (car (x))) 2858 if (is_vector (car (x)))
2919 { 2859 {
2920 location = hash_fn (symname (hdl), veclength (car (x))); 2860 int location = sym_hash (hdl, veclength (car (x)));
2921 y = vector_elem (car (x), location); 2861 y = vector_get (car (x), location);
2922 } 2862 }
2923 else 2863 else
2924 y = car (x); 2864 y = car (x);
2925 2865
2926 for (; y != NIL; y = cdr (y)) 2866 for (; y != NIL; y = cdr (y))
2927 if (caar (y) == hdl) 2867 if (caar (y) == hdl)
2928 break; 2868 break;
2929 2869
2930 if (y != NIL) 2870 if (y != NIL)
2871 return car (y);
2872
2873 if (!all)
2931 break; 2874 break;
2932
2933 if (!all)
2934 return NIL;
2935 } 2875 }
2936
2937 if (x != NIL)
2938 return car (y);
2939 2876
2940 return NIL; 2877 return NIL;
2941} 2878}
2942 2879
2943#else /* USE_ALIST_ENV */ 2880#else /* USE_ALIST_ENV */
2944 2881
2945ecb_inline void 2882static void
2946new_frame_in_env (SCHEME_P_ pointer old_env) 2883new_frame_in_env (SCHEME_P_ pointer old_env)
2947{ 2884{
2948 SCHEME_V->envir = immutable_cons (NIL, old_env); 2885 SCHEME_V->envir = immutable_cons (NIL, old_env);
2949 setenvironment (SCHEME_V->envir); 2886 setenvironment (SCHEME_V->envir);
2950} 2887}
2951 2888
2952ecb_inline void 2889static void
2953new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2890new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2954{ 2891{
2955 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2892 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2956} 2893}
2957 2894
2958static pointer 2895ecb_hot static pointer
2959find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2896find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2960{ 2897{
2961 pointer x, y; 2898 pointer x, y;
2962 2899
2963 for (x = env; x != NIL; x = cdr (x)) 2900 for (x = env; x != NIL; x = cdr (x))
… …
2965 for (y = car (x); y != NIL; y = cdr (y)) 2902 for (y = car (x); y != NIL; y = cdr (y))
2966 if (caar (y) == hdl) 2903 if (caar (y) == hdl)
2967 break; 2904 break;
2968 2905
2969 if (y != NIL) 2906 if (y != NIL)
2907 return car (y);
2970 break; 2908 break;
2971 2909
2972 if (!all) 2910 if (!all)
2973 return NIL; 2911 break;
2974 } 2912 }
2975
2976 if (x != NIL)
2977 return car (y);
2978 2913
2979 return NIL; 2914 return NIL;
2980} 2915}
2981 2916
2982#endif /* USE_ALIST_ENV else */ 2917#endif /* USE_ALIST_ENV else */
2983 2918
2984ecb_inline void 2919static void
2985new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2920new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2986{ 2921{
2922 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2987 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2923 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2988} 2924}
2989 2925
2990ecb_inline void 2926static void
2991set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2927set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2992{ 2928{
2993 set_cdr (slot, value); 2929 set_cdr (slot, value);
2994} 2930}
2995 2931
2996ecb_inline pointer 2932static pointer
2997slot_value_in_env (pointer slot) 2933slot_value_in_env (pointer slot)
2998{ 2934{
2999 return cdr (slot); 2935 return cdr (slot);
3000} 2936}
3001 2937
3002/* ========== Evaluation Cycle ========== */ 2938/* ========== Evaluation Cycle ========== */
3003 2939
3004static int 2940ecb_cold static int
3005xError_1 (SCHEME_P_ const char *s, pointer a) 2941xError_1 (SCHEME_P_ const char *s, pointer a)
3006{ 2942{
3007#if USE_ERROR_HOOK
3008 pointer x;
3009 pointer hdl = SCHEME_V->ERROR_HOOK;
3010#endif
3011
3012#if USE_PRINTF 2943#if USE_PRINTF
3013#if SHOW_ERROR_LINE 2944#if SHOW_ERROR_LINE
3014 char sbuf[STRBUFFSIZE]; 2945 char sbuf[STRBUFFSIZE];
3015 2946
3016 /* make sure error is not in REPL */ 2947 /* make sure error is not in REPL */
… …
3031 } 2962 }
3032#endif 2963#endif
3033#endif 2964#endif
3034 2965
3035#if USE_ERROR_HOOK 2966#if USE_ERROR_HOOK
3036 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2967 pointer x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->ERROR_HOOK, 1);
3037 2968
3038 if (x != NIL) 2969 if (x != NIL)
3039 { 2970 {
3040 pointer code = a 2971 pointer code = a
3041 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2972 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3085 pointer code; 3016 pointer code;
3086}; 3017};
3087 3018
3088# define STACK_GROWTH 3 3019# define STACK_GROWTH 3
3089 3020
3090static void 3021ecb_hot static void
3091s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3022s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3092{ 3023{
3093 int nframes = (uintptr_t)SCHEME_V->dump; 3024 int nframes = (uintptr_t)SCHEME_V->dump;
3094 struct dump_stack_frame *next_frame; 3025 struct dump_stack_frame *next_frame;
3095 3026
3096 /* enough room for the next frame? */ 3027 /* enough room for the next frame? */
3097 if (nframes >= SCHEME_V->dump_size) 3028 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3098 { 3029 {
3099 SCHEME_V->dump_size += STACK_GROWTH; 3030 SCHEME_V->dump_size += STACK_GROWTH;
3100 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3031 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3101 } 3032 }
3102 3033
… …
3108 next_frame->code = code; 3039 next_frame->code = code;
3109 3040
3110 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3111} 3042}
3112 3043
3113static int 3044static ecb_hot int
3114xs_return (SCHEME_P_ pointer a) 3045xs_return (SCHEME_P_ pointer a)
3115{ 3046{
3116 int nframes = (uintptr_t)SCHEME_V->dump; 3047 int nframes = (uintptr_t)SCHEME_V->dump;
3117 struct dump_stack_frame *frame; 3048 struct dump_stack_frame *frame;
3118 3049
… …
3129 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3060 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3130 3061
3131 return 0; 3062 return 0;
3132} 3063}
3133 3064
3134ecb_inline void 3065ecb_cold void
3135dump_stack_reset (SCHEME_P) 3066dump_stack_reset (SCHEME_P)
3136{ 3067{
3137 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3068 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3138 SCHEME_V->dump = (pointer)+0; 3069 SCHEME_V->dump = (pointer)+0;
3139} 3070}
3140 3071
3141ecb_inline void 3072ecb_cold void
3142dump_stack_initialize (SCHEME_P) 3073dump_stack_initialize (SCHEME_P)
3143{ 3074{
3144 SCHEME_V->dump_size = 0; 3075 SCHEME_V->dump_size = 0;
3145 SCHEME_V->dump_base = 0; 3076 SCHEME_V->dump_base = 0;
3146 dump_stack_reset (SCHEME_A); 3077 dump_stack_reset (SCHEME_A);
3147} 3078}
3148 3079
3149static void 3080ecb_cold static void
3150dump_stack_free (SCHEME_P) 3081dump_stack_free (SCHEME_P)
3151{ 3082{
3152 free (SCHEME_V->dump_base); 3083 free (SCHEME_V->dump_base);
3153 SCHEME_V->dump_base = 0; 3084 SCHEME_V->dump_base = 0;
3154 SCHEME_V->dump = (pointer)0; 3085 SCHEME_V->dump = (pointer)0;
3155 SCHEME_V->dump_size = 0; 3086 SCHEME_V->dump_size = 0;
3156} 3087}
3157 3088
3158static void 3089ecb_cold static void
3159dump_stack_mark (SCHEME_P) 3090dump_stack_mark (SCHEME_P)
3160{ 3091{
3161 int nframes = (uintptr_t)SCHEME_V->dump; 3092 int nframes = (uintptr_t)SCHEME_V->dump;
3162 int i; 3093 int i;
3163 3094
… …
3169 mark (frame->envir); 3100 mark (frame->envir);
3170 mark (frame->code); 3101 mark (frame->code);
3171 } 3102 }
3172} 3103}
3173 3104
3174static pointer 3105ecb_cold static pointer
3175ss_get_cont (SCHEME_P) 3106ss_get_cont (SCHEME_P)
3176{ 3107{
3177 int nframes = (uintptr_t)SCHEME_V->dump; 3108 int nframes = (uintptr_t)SCHEME_V->dump;
3178 int i; 3109 int i;
3179 3110
… …
3191 } 3122 }
3192 3123
3193 return cont; 3124 return cont;
3194} 3125}
3195 3126
3196static void 3127ecb_cold static void
3197ss_set_cont (SCHEME_P_ pointer cont) 3128ss_set_cont (SCHEME_P_ pointer cont)
3198{ 3129{
3199 int i = 0; 3130 int i = 0;
3200 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3131 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3201 3132
… …
3213 SCHEME_V->dump = (pointer)(uintptr_t)i; 3144 SCHEME_V->dump = (pointer)(uintptr_t)i;
3214} 3145}
3215 3146
3216#else 3147#else
3217 3148
3218ecb_inline void 3149ecb_cold void
3219dump_stack_reset (SCHEME_P) 3150dump_stack_reset (SCHEME_P)
3220{ 3151{
3221 SCHEME_V->dump = NIL; 3152 SCHEME_V->dump = NIL;
3222} 3153}
3223 3154
3224ecb_inline void 3155ecb_cold void
3225dump_stack_initialize (SCHEME_P) 3156dump_stack_initialize (SCHEME_P)
3226{ 3157{
3227 dump_stack_reset (SCHEME_A); 3158 dump_stack_reset (SCHEME_A);
3228} 3159}
3229 3160
3230static void 3161ecb_cold static void
3231dump_stack_free (SCHEME_P) 3162dump_stack_free (SCHEME_P)
3232{ 3163{
3233 SCHEME_V->dump = NIL; 3164 SCHEME_V->dump = NIL;
3234} 3165}
3235 3166
3236static int 3167ecb_hot static int
3237xs_return (SCHEME_P_ pointer a) 3168xs_return (SCHEME_P_ pointer a)
3238{ 3169{
3239 pointer dump = SCHEME_V->dump; 3170 pointer dump = SCHEME_V->dump;
3240 3171
3241 SCHEME_V->value = a; 3172 SCHEME_V->value = a;
… …
3251 SCHEME_V->dump = dump; 3182 SCHEME_V->dump = dump;
3252 3183
3253 return 0; 3184 return 0;
3254} 3185}
3255 3186
3256static void 3187ecb_hot static void
3257s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3188s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3258{ 3189{
3259 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3190 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3260 cons (args, 3191 cons (args,
3261 cons (SCHEME_V->envir, 3192 cons (SCHEME_V->envir,
3262 cons (code, 3193 cons (code,
3263 SCHEME_V->dump)))); 3194 SCHEME_V->dump))));
3264} 3195}
3265 3196
3197ecb_cold static void
3198dump_stack_mark (SCHEME_P)
3199{
3200 mark (SCHEME_V->dump);
3201}
3202
3203ecb_cold static pointer
3204ss_get_cont (SCHEME_P)
3205{
3206 return SCHEME_V->dump;
3207}
3208
3209ecb_cold static void
3210ss_set_cont (SCHEME_P_ pointer cont)
3211{
3212 SCHEME_V->dump = cont;
3213}
3214
3215#endif
3216
3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3218
3219#if EXPERIMENT
3220
3221static int
3222dtree (SCHEME_P_ int indent, pointer x)
3223{
3224 int c;
3225
3226 if (is_syntax (x))
3227 {
3228 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3229 return 8 + 8;
3230 }
3231
3232 if (x == NIL)
3233 {
3234 printf ("%*sNIL\n", indent, "");
3235 return 3;
3236 }
3237
3238 switch (type (x))
3239 {
3240 case T_INTEGER:
3241 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3242 return 32+8;
3243
3244 case T_SYMBOL:
3245 printf ("%*sS<%s>\n", indent, "", symname (x));
3246 return 24+8;
3247
3248 case T_CLOSURE:
3249 printf ("%*sS<%s>\n", indent, "", "closure");
3250 dtree (SCHEME_A_ indent + 3, cdr(x));
3251 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3252
3253 case T_PAIR:
3254 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3255 c = dtree (SCHEME_A_ indent + 3, car (x));
3256 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3257 return c + 1;
3258
3259 case T_PORT:
3260 printf ("%*sS<%s>\n", indent, "", "port");
3261 return 24+8;
3262
3263 case T_VECTOR:
3264 printf ("%*sS<%s>\n", indent, "", "vector");
3265 return 24+8;
3266
3267 case T_ENVIRONMENT:
3268 printf ("%*sS<%s>\n", indent, "", "environment");
3269 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3270
3271 default:
3272 printf ("unhandled type %d\n", type (x));
3273 break;
3274 }
3275}
3276
3277#define DUMP(t) do { printf ("DUMP %s:%d\n", __FILE__, __LINE__); dtree (SCHEME_A_ 0, (t)); } while (0)
3278
3279typedef void *stream[1];
3280
3281#define stream_init() { 0 }
3282#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3283#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3284#define stream_free(s) free (s[0])
3285
3286ecb_cold static void
3287stream_put (stream s, uint8_t byte)
3288{
3289 uint32_t *sp = *s;
3290 uint32_t size = sizeof (uint32_t) * 2;
3291 uint32_t offs = size;
3292
3293 if (ecb_expect_true (sp))
3294 {
3295 offs = sp[0];
3296 size = sp[1];
3297 }
3298
3299 if (ecb_expect_false (offs == size))
3300 {
3301 size *= 2;
3302 sp = realloc (sp, size);
3303 *s = sp;
3304 sp[1] = size;
3305
3306 }
3307
3308 ((uint8_t *)sp)[offs++] = byte;
3309 sp[0] = offs;
3310}
3311
3312ecb_cold static void
3313stream_put_v (stream s, uint32_t v)
3314{
3315 while (v > 0x7f)
3316 {
3317 stream_put (s, v | 0x80);
3318 v >>= 7;
3319 }
3320
3321 stream_put (s, v);
3322}
3323
3324ecb_cold static void
3325stream_put_tv (stream s, int bop, uint32_t v)
3326{
3327 printf ("put tv %d %d\n", bop, v);//D
3328 stream_put (s, bop);
3329 stream_put_v (s, v);
3330}
3331
3332ecb_cold static void
3333stream_put_stream (stream s, stream o)
3334{
3335 uint32_t i;
3336
3337 for (i = 0; i < stream_size (o); ++i)
3338 stream_put (s, stream_data (o)[i]);
3339
3340 stream_free (o);
3341}
3342
3343// calculates a (preferably small) integer that makes it possible to find
3344// the symbol again. if pointers were offsets into a memory area... until
3345// then, we return segment number in the low bits, and offset in the high
3346// bits.
3347// also, this function must never return 0.
3348ecb_cold static uint32_t
3349symbol_id (SCHEME_P_ pointer sym)
3350{
3351 struct cell *p = CELL (sym);
3352 int i;
3353
3354 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3355 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3356 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3357
3358 abort ();
3359}
3360
3361ecb_cold static uint32_t
3362cell_id (SCHEME_P_ pointer p)
3363{
3364 return symbol_id (SCHEME_A_ p);
3365}
3366
3367enum byteop
3368{
3369 BOP_NIL,
3370 BOP_SYNTAX,
3371 BOP_INTEGER,
3372 BOP_SYMBOL,
3373 BOP_LIST_BEG,
3374 BOP_LIST_END,
3375 BOP_BIFT, // branch if true
3376 BOP_BIFF, // branch if false
3377 BOP_BIFNE, // branch if not eqv?
3378 BOP_BRA, // "short" branch
3379 BOP_JMP, // "long" jump
3380 BOP_DATUM,
3381 BOP_LET,
3382 BOP_LETAST,
3383 BOP_LETREC,
3384 BOP_DEFINE,
3385 BOP_MACRO,
3386 BOP_SET,
3387 BOP_BEGIN,
3388 BOP_LAMBDA,
3389};
3390
3391ecb_cold static void compile_expr (SCHEME_P_ stream s, pointer x);
3392
3393ecb_cold static void
3394compile_list (SCHEME_P_ stream s, pointer x)
3395{
3396 for (; x != NIL; x = cdr (x))
3397 compile_expr (SCHEME_A_ s, car (x));
3398}
3399
3266static void 3400static void
3267dump_stack_mark (SCHEME_P) 3401compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3268{ 3402{
3269 mark (SCHEME_V->dump); 3403 //TODO: borked
3270} 3404 stream sift = stream_init (); compile_expr (SCHEME_A_ sift, ift);
3271 3405
3272static pointer 3406 stream_put (s, BOP_BIFF);
3273ss_get_cont (SCHEME_P) 3407 compile_expr (SCHEME_A_ s, cond);
3408 stream_put_v (s, stream_size (sift));
3409 stream_put_stream (s, sift);
3410
3411 if (iff != NIL)
3412 {
3413 stream siff = stream_init (); compile_expr (SCHEME_A_ siff, iff);
3414 stream_put_tv (s, BOP_BRA, stream_size (siff));
3415 stream_put_stream (s, siff);
3416 }
3417}
3418
3419typedef uint32_t stream_fixup;
3420
3421static stream_fixup
3422stream_put_fixup (stream s)
3274{ 3423{
3275 return SCHEME_V->dump; 3424 stream_put (s, 0);
3425 stream_put (s, 0);
3426
3427 return stream_size (s);
3276} 3428}
3277 3429
3278static void 3430static void
3279ss_set_cont (SCHEME_P_ pointer cont) 3431stream_fix_fixup (stream s, stream_fixup fixup, uint32_t target)
3280{ 3432{
3281 SCHEME_V->dump = cont; 3433 target -= fixup;
3434 assert (target < (1 << 14));
3435 stream_data (s)[fixup - 2] = target | 0x80;
3436 stream_data (s)[fixup - 1] = target >> 7;
3282} 3437}
3283 3438
3284#endif
3285
3286#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3287
3288static int 3439static void
3440compile_and_or (SCHEME_P_ stream s, int and, pointer x)
3441{
3442 if (cdr (x) == NIL)
3443 compile_expr (SCHEME_A_ s, car (x));
3444 else
3445 {
3446 stream_put (s, and ? BOP_BIFF : BOP_BIFT);
3447 compile_expr (SCHEME_A_ s, car (x));
3448 stream_fixup end = stream_put_fixup (s);
3449
3450 compile_and_or (SCHEME_A_ s, and, cdr (x));
3451 stream_fix_fixup (s, end, stream_size (s));
3452 }
3453}
3454
3455ecb_cold static void
3456compile_expr (SCHEME_P_ stream s, pointer x)
3457{
3458 if (x == NIL)
3459 {
3460 stream_put (s, BOP_NIL);
3461 return;
3462 }
3463
3464 if (is_pair (x))
3465 {
3466 pointer head = car (x);
3467
3468 if (is_syntax (head))
3469 {
3470 x = cdr (x);
3471
3472 switch (syntaxnum (head))
3473 {
3474 case OP_IF0: /* if */
3475 compile_if (SCHEME_A_ s, car (x), cadr (x), caddr (x));
3476 break;
3477
3478 case OP_OR0: /* or */
3479 compile_and_or (SCHEME_A_ s, 0, x);
3480 break;
3481
3482 case OP_AND0: /* and */
3483 compile_and_or (SCHEME_A_ s, 1, x);
3484 break;
3485
3486 case OP_CASE0: /* case */
3487 abort ();
3488 break;
3489
3490 case OP_COND0: /* cond */
3491 abort ();
3492 break;
3493
3494 case OP_LET0: /* let */
3495 case OP_LET0AST: /* let* */
3496 case OP_LET0REC: /* letrec */
3497 switch (syntaxnum (head))
3498 {
3499 case OP_LET0: stream_put (s, BOP_LET ); break;
3500 case OP_LET0AST: stream_put (s, BOP_LETAST); break;
3501 case OP_LET0REC: stream_put (s, BOP_LETREC); break;
3502 }
3503
3504 {
3505 pointer bindings = car (x);
3506 pointer body = cadr (x);
3507
3508 for (x = bindings; x != NIL; x = cdr (x))
3509 {
3510 pointer init = NIL;
3511 pointer var = car (x);
3512
3513 if (is_pair (var))
3514 {
3515 init = cdr (var);
3516 var = car (var);
3517 }
3518
3519 stream_put_v (s, symbol_id (SCHEME_A_ var));
3520 compile_expr (SCHEME_A_ s, init);
3521 }
3522
3523 stream_put_v (s, 0);
3524 compile_expr (SCHEME_A_ s, body);
3525 }
3526 break;
3527
3528 case OP_DEF0: /* define */
3529 case OP_MACRO0: /* macro */
3530 stream_put (s, syntaxnum (head) == OP_DEF0 ? BOP_DEFINE : BOP_MACRO);
3531 stream_put_v (s, cell_id (SCHEME_A_ car (x)));
3532 compile_expr (SCHEME_A_ s, cadr (x));
3533 break;
3534
3535 case OP_SET0: /* set! */
3536 stream_put (s, BOP_SET);
3537 stream_put_v (s, symbol_id (SCHEME_A_ car (x)));
3538 compile_expr (SCHEME_A_ s, cadr (x));
3539 break;
3540
3541 case OP_BEGIN: /* begin */
3542 stream_put (s, BOP_BEGIN);
3543 compile_list (SCHEME_A_ s, x);
3544 return;
3545
3546 case OP_DELAY: /* delay */
3547 abort ();
3548 break;
3549
3550 case OP_QUOTE: /* quote */
3551 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3552 break;
3553
3554 case OP_LAMBDA: /* lambda */
3555 {
3556 pointer formals = car (x);
3557 pointer body = cadr (x);
3558
3559 stream_put (s, BOP_LAMBDA);
3560
3561 for (; is_pair (formals); formals = cdr (formals))
3562 stream_put_v (s, symbol_id (SCHEME_A_ car (formals)));
3563
3564 stream_put_v (s, 0);
3565 stream_put_v (s, formals == NIL ? 0 : symbol_id (SCHEME_A_ formals));
3566
3567 compile_expr (SCHEME_A_ s, body);
3568 }
3569 break;
3570
3571 case OP_C0STREAM:/* cons-stream */
3572 abort ();
3573 break;
3574 }
3575
3576 return;
3577 }
3578
3579 pointer m = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, head, 1);
3580
3581 if (m != NIL)
3582 {
3583 m = slot_value_in_env (m);
3584
3585 if (is_macro (m))
3586 {
3587 s_save (SCHEME_A_ OP_DEBUG2, SCHEME_V->args, SCHEME_V->code);
3588 SCHEME_V->code = m;
3589 SCHEME_V->args = cons (x, NIL);
3590 Eval_Cycle (SCHEME_A_ OP_APPLY);
3591 x = SCHEME_V->value;
3592 compile_expr (SCHEME_A_ s, SCHEME_V->value);
3593 return;
3594 }
3595 }
3596 }
3597
3598 switch (type (x))
3599 {
3600 case T_INTEGER:
3601 {
3602 IVALUE iv = ivalue_unchecked (x);
3603 iv = iv < 0 ? ((uint32_t)-iv << 1) | 1 : (uint32_t)iv << 1;
3604 stream_put_tv (s, BOP_INTEGER, iv);
3605 }
3606 return;
3607
3608 case T_SYMBOL:
3609 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3610 return;
3611
3612 case T_PAIR:
3613 stream_put (s, BOP_LIST_BEG);
3614
3615 for (; x != NIL; x = cdr (x))
3616 compile_expr (SCHEME_A_ s, car (x));
3617
3618 stream_put (s, BOP_LIST_END);
3619 return;
3620
3621 default:
3622 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3623 break;
3624 }
3625}
3626
3627ecb_cold static int
3628compile_closure (SCHEME_P_ pointer p)
3629{
3630 stream s = stream_init ();
3631
3632 compile_list (SCHEME_A_ s, cdar (p));
3633
3634 FILE *xxd = popen ("xxd", "we");
3635 fwrite (stream_data (s), 1, stream_size (s), xxd);
3636 fclose (xxd);
3637
3638 return stream_size (s);
3639}
3640
3641#endif
3642
3643/* syntax, eval, core, ... */
3644ecb_hot static int
3289opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3645opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3290{ 3646{
3291 pointer args = SCHEME_V->args; 3647 pointer args = SCHEME_V->args;
3292 pointer x, y; 3648 pointer x, y;
3293 3649
3294 switch (op) 3650 switch (op)
3295 { 3651 {
3652#if EXPERIMENT //D
3653 case OP_DEBUG:
3654 {
3655 uint32_t len = compile_closure (SCHEME_A_ car (args));
3656 printf ("len = %d\n", len);
3657 printf ("\n");
3658 s_return (S_T);
3659 }
3660
3661 case OP_DEBUG2:
3662 return -1;
3663#endif
3664
3296 case OP_LOAD: /* load */ 3665 case OP_LOAD: /* load */
3297 if (file_interactive (SCHEME_A)) 3666 if (file_interactive (SCHEME_A))
3298 { 3667 {
3299 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3668 putstr (SCHEME_A_ "Loading ");
3300 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3669 putstr (SCHEME_A_ strvalue (car (args)));
3670 putcharacter (SCHEME_A_ '\n');
3301 } 3671 }
3302 3672
3303 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3673 if (!file_push (SCHEME_A_ strvalue (car (args))))
3304 Error_1 ("unable to open", car (args)); 3674 Error_1 ("unable to open", car (args));
3305 else 3675
3306 {
3307 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3676 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3308 s_goto (OP_T0LVL); 3677 s_goto (OP_T0LVL);
3309 }
3310 3678
3311 case OP_T0LVL: /* top level */ 3679 case OP_T0LVL: /* top level */
3312 3680
3313 /* If we reached the end of file, this loop is done. */ 3681 /* If we reached the end of file, this loop is done. */
3314 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3682 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3315 { 3683 {
3316 if (SCHEME_V->file_i == 0) 3684 if (SCHEME_V->file_i == 0)
3317 { 3685 {
3318 SCHEME_V->args = NIL; 3686 SCHEME_V->args = NIL;
3319 s_goto (OP_QUIT); 3687 s_goto (OP_QUIT);
… …
3330 /* If interactive, be nice to user. */ 3698 /* If interactive, be nice to user. */
3331 if (file_interactive (SCHEME_A)) 3699 if (file_interactive (SCHEME_A))
3332 { 3700 {
3333 SCHEME_V->envir = SCHEME_V->global_env; 3701 SCHEME_V->envir = SCHEME_V->global_env;
3334 dump_stack_reset (SCHEME_A); 3702 dump_stack_reset (SCHEME_A);
3335 putstr (SCHEME_A_ "\n"); 3703 putcharacter (SCHEME_A_ '\n');
3704#if EXPERIMENT
3705 system ("ps v $PPID");
3706#endif
3336 putstr (SCHEME_A_ prompt); 3707 putstr (SCHEME_A_ prompt);
3337 } 3708 }
3338 3709
3339 /* Set up another iteration of REPL */ 3710 /* Set up another iteration of REPL */
3340 SCHEME_V->nesting = 0; 3711 SCHEME_V->nesting = 0;
… …
3375 { 3746 {
3376 SCHEME_V->print_flag = 1; 3747 SCHEME_V->print_flag = 1;
3377 SCHEME_V->args = SCHEME_V->value; 3748 SCHEME_V->args = SCHEME_V->value;
3378 s_goto (OP_P0LIST); 3749 s_goto (OP_P0LIST);
3379 } 3750 }
3380 else 3751
3381 s_return (SCHEME_V->value); 3752 s_return (SCHEME_V->value);
3382 3753
3383 case OP_EVAL: /* main part of evaluation */ 3754 case OP_EVAL: /* main part of evaluation */
3384#if USE_TRACING 3755#if USE_TRACING
3385 if (SCHEME_V->tracing) 3756 if (SCHEME_V->tracing)
3386 { 3757 {
… …
3397#endif 3768#endif
3398 if (is_symbol (SCHEME_V->code)) /* symbol */ 3769 if (is_symbol (SCHEME_V->code)) /* symbol */
3399 { 3770 {
3400 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3771 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3401 3772
3402 if (x != NIL) 3773 if (x == NIL)
3403 s_return (slot_value_in_env (x));
3404 else
3405 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3774 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3775
3776 s_return (slot_value_in_env (x));
3406 } 3777 }
3407 else if (is_pair (SCHEME_V->code)) 3778 else if (is_pair (SCHEME_V->code))
3408 { 3779 {
3409 x = car (SCHEME_V->code); 3780 x = car (SCHEME_V->code);
3410 3781
… …
3419 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3790 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3420 SCHEME_V->code = x; 3791 SCHEME_V->code = x;
3421 s_goto (OP_EVAL); 3792 s_goto (OP_EVAL);
3422 } 3793 }
3423 } 3794 }
3424 else 3795
3425 s_return (SCHEME_V->code); 3796 s_return (SCHEME_V->code);
3426 3797
3427 case OP_E0ARGS: /* eval arguments */ 3798 case OP_E0ARGS: /* eval arguments */
3428 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3799 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3429 { 3800 {
3430 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3801 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3431 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3802 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3432 SCHEME_V->code = SCHEME_V->value; 3803 SCHEME_V->code = SCHEME_V->value;
3433 s_goto (OP_APPLY); 3804 s_goto (OP_APPLY);
3434 } 3805 }
3435 else 3806
3436 {
3437 SCHEME_V->code = cdr (SCHEME_V->code); 3807 SCHEME_V->code = cdr (SCHEME_V->code);
3438 s_goto (OP_E1ARGS); 3808 s_goto (OP_E1ARGS);
3439 }
3440 3809
3441 case OP_E1ARGS: /* eval arguments */ 3810 case OP_E1ARGS: /* eval arguments */
3442 args = cons (SCHEME_V->value, args); 3811 args = cons (SCHEME_V->value, args);
3443 3812
3444 if (is_pair (SCHEME_V->code)) /* continue */ 3813 if (is_pair (SCHEME_V->code)) /* continue */
… …
3455 SCHEME_V->args = cdr (args); 3824 SCHEME_V->args = cdr (args);
3456 s_goto (OP_APPLY); 3825 s_goto (OP_APPLY);
3457 } 3826 }
3458 3827
3459#if USE_TRACING 3828#if USE_TRACING
3460
3461 case OP_TRACING: 3829 case OP_TRACING:
3462 { 3830 {
3463 int tr = SCHEME_V->tracing; 3831 int tr = SCHEME_V->tracing;
3464 3832
3465 SCHEME_V->tracing = ivalue_unchecked (car (args)); 3833 SCHEME_V->tracing = ivalue_unchecked (car (args));
3466 s_return (mk_integer (SCHEME_A_ tr)); 3834 s_return (mk_integer (SCHEME_A_ tr));
3467 } 3835 }
3468
3469#endif 3836#endif
3470 3837
3471 case OP_APPLY: /* apply 'code' to 'args' */ 3838 case OP_APPLY: /* apply 'code' to 'args' */
3472#if USE_TRACING 3839#if USE_TRACING
3473 if (SCHEME_V->tracing) 3840 if (SCHEME_V->tracing)
… …
3487 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3854 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3488 else if (is_foreign (SCHEME_V->code)) 3855 else if (is_foreign (SCHEME_V->code))
3489 { 3856 {
3490 /* Keep nested calls from GC'ing the arglist */ 3857 /* Keep nested calls from GC'ing the arglist */
3491 push_recent_alloc (SCHEME_A_ args, NIL); 3858 push_recent_alloc (SCHEME_A_ args, NIL);
3492 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3859 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3493 3860
3494 s_return (x); 3861 s_return (x);
3495 } 3862 }
3496 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3863 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3497 { 3864 {
… …
3527 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3894 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3528 { 3895 {
3529 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3896 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3530 s_return (args != NIL ? car (args) : NIL); 3897 s_return (args != NIL ? car (args) : NIL);
3531 } 3898 }
3532 else 3899
3533 Error_0 ("illegal function"); 3900 Error_0 ("illegal function");
3534 3901
3535 case OP_DOMACRO: /* do macro */ 3902 case OP_DOMACRO: /* do macro */
3536 SCHEME_V->code = SCHEME_V->value; 3903 SCHEME_V->code = SCHEME_V->value;
3537 s_goto (OP_EVAL); 3904 s_goto (OP_EVAL);
3538
3539#if 1
3540 3905
3541 case OP_LAMBDA: /* lambda */ 3906 case OP_LAMBDA: /* lambda */
3542 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3907 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3543 set SCHEME_V->value fall thru */ 3908 set SCHEME_V->value fall thru */
3544 { 3909 {
… …
3551 SCHEME_V->code = slot_value_in_env (f); 3916 SCHEME_V->code = slot_value_in_env (f);
3552 s_goto (OP_APPLY); 3917 s_goto (OP_APPLY);
3553 } 3918 }
3554 3919
3555 SCHEME_V->value = SCHEME_V->code; 3920 SCHEME_V->value = SCHEME_V->code;
3556 /* Fallthru */
3557 } 3921 }
3922 /* Fallthru */
3558 3923
3559 case OP_LAMBDA1: 3924 case OP_LAMBDA1:
3560 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3925 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3561
3562#else
3563
3564 case OP_LAMBDA: /* lambda */
3565 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3566
3567#endif
3568 3926
3569 case OP_MKCLOSURE: /* make-closure */ 3927 case OP_MKCLOSURE: /* make-closure */
3570 x = car (args); 3928 x = car (args);
3571 3929
3572 if (car (x) == SCHEME_V->LAMBDA) 3930 if (car (x) == SCHEME_V->LAMBDA)
… …
3611 else 3969 else
3612 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3970 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3613 3971
3614 s_return (SCHEME_V->code); 3972 s_return (SCHEME_V->code);
3615 3973
3616
3617 case OP_DEFP: /* defined? */ 3974 case OP_DEFP: /* defined? */
3618 x = SCHEME_V->envir; 3975 x = SCHEME_V->envir;
3619 3976
3620 if (cdr (args) != NIL) 3977 if (cdr (args) != NIL)
3621 x = cadr (args); 3978 x = cadr (args);
… …
3639 s_return (SCHEME_V->value); 3996 s_return (SCHEME_V->value);
3640 } 3997 }
3641 else 3998 else
3642 Error_1 ("set!: unbound variable:", SCHEME_V->code); 3999 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3643 4000
3644
3645 case OP_BEGIN: /* begin */ 4001 case OP_BEGIN: /* begin */
3646 if (!is_pair (SCHEME_V->code)) 4002 if (!is_pair (SCHEME_V->code))
3647 s_return (SCHEME_V->code); 4003 s_return (SCHEME_V->code);
3648 4004
3649 if (cdr (SCHEME_V->code) != NIL) 4005 if (cdr (SCHEME_V->code) != NIL)
… …
3660 case OP_IF1: /* if */ 4016 case OP_IF1: /* if */
3661 if (is_true (SCHEME_V->value)) 4017 if (is_true (SCHEME_V->value))
3662 SCHEME_V->code = car (SCHEME_V->code); 4018 SCHEME_V->code = car (SCHEME_V->code);
3663 else 4019 else
3664 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 4020 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
4021
3665 s_goto (OP_EVAL); 4022 s_goto (OP_EVAL);
3666 4023
3667 case OP_LET0: /* let */ 4024 case OP_LET0: /* let */
3668 SCHEME_V->args = NIL; 4025 SCHEME_V->args = NIL;
3669 SCHEME_V->value = SCHEME_V->code; 4026 SCHEME_V->value = SCHEME_V->code;
3670 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 4027 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3671 s_goto (OP_LET1); 4028 s_goto (OP_LET1);
3672 4029
3673 case OP_LET1: /* let (calculate parameters) */ 4030 case OP_LET1: /* let (calculate parameters) */
4031 case OP_LET1REC: /* letrec (calculate parameters) */
3674 args = cons (SCHEME_V->value, args); 4032 args = cons (SCHEME_V->value, args);
3675 4033
3676 if (is_pair (SCHEME_V->code)) /* continue */ 4034 if (is_pair (SCHEME_V->code)) /* continue */
3677 { 4035 {
3678 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 4036 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3679 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 4037 Error_1 ("Bad syntax of binding spec in let/letrec:", car (SCHEME_V->code));
3680 4038
3681 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4039 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3682 SCHEME_V->code = cadar (SCHEME_V->code); 4040 SCHEME_V->code = cadar (SCHEME_V->code);
3683 SCHEME_V->args = NIL; 4041 SCHEME_V->args = NIL;
3684 s_goto (OP_EVAL); 4042 s_goto (OP_EVAL);
3685 } 4043 }
3686 else /* end */ 4044
3687 { 4045 /* end */
3688 args = reverse_in_place (SCHEME_A_ NIL, args); 4046 args = reverse_in_place (SCHEME_A_ NIL, args);
3689 SCHEME_V->code = car (args); 4047 SCHEME_V->code = car (args);
3690 SCHEME_V->args = cdr (args); 4048 SCHEME_V->args = cdr (args);
3691 s_goto (OP_LET2); 4049 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3692 }
3693 4050
3694 case OP_LET2: /* let */ 4051 case OP_LET2: /* let */
3695 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4052 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3696 4053
3697 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args; 4054 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
… …
3701 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4058 if (is_symbol (car (SCHEME_V->code))) /* named let */
3702 { 4059 {
3703 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x)) 4060 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3704 { 4061 {
3705 if (!is_pair (x)) 4062 if (!is_pair (x))
3706 Error_1 ("Bad syntax of binding in let :", x); 4063 Error_1 ("Bad syntax of binding in let:", x);
3707 4064
3708 if (!is_list (SCHEME_A_ car (x))) 4065 if (!is_list (SCHEME_A_ car (x)))
3709 Error_1 ("Bad syntax of binding in let :", car (x)); 4066 Error_1 ("Bad syntax of binding in let:", car (x));
3710 4067
3711 args = cons (caar (x), args); 4068 args = cons (caar (x), args);
3712 } 4069 }
3713 4070
3714 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)), 4071 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
… …
3731 SCHEME_V->code = cdr (SCHEME_V->code); 4088 SCHEME_V->code = cdr (SCHEME_V->code);
3732 s_goto (OP_BEGIN); 4089 s_goto (OP_BEGIN);
3733 } 4090 }
3734 4091
3735 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code))) 4092 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code)))
3736 Error_1 ("Bad syntax of binding spec in let* :", car (SCHEME_V->code)); 4093 Error_1 ("Bad syntax of binding spec in let*:", car (SCHEME_V->code));
3737 4094
3738 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code)); 4095 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code));
3739 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4096 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3740 s_goto (OP_EVAL); 4097 s_goto (OP_EVAL);
3741 4098
… …
3752 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4109 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3753 SCHEME_V->code = cadar (SCHEME_V->code); 4110 SCHEME_V->code = cadar (SCHEME_V->code);
3754 SCHEME_V->args = NIL; 4111 SCHEME_V->args = NIL;
3755 s_goto (OP_EVAL); 4112 s_goto (OP_EVAL);
3756 } 4113 }
3757 else /* end */ 4114
4115 /* end */
3758 { 4116
3759 SCHEME_V->code = args; 4117 SCHEME_V->code = args;
3760 SCHEME_V->args = NIL; 4118 SCHEME_V->args = NIL;
3761 s_goto (OP_BEGIN); 4119 s_goto (OP_BEGIN);
3762 }
3763 4120
3764 case OP_LET0REC: /* letrec */ 4121 case OP_LET0REC: /* letrec */
3765 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4122 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3766 SCHEME_V->args = NIL; 4123 SCHEME_V->args = NIL;
3767 SCHEME_V->value = SCHEME_V->code; 4124 SCHEME_V->value = SCHEME_V->code;
3768 SCHEME_V->code = car (SCHEME_V->code); 4125 SCHEME_V->code = car (SCHEME_V->code);
3769 s_goto (OP_LET1REC); 4126 s_goto (OP_LET1REC);
3770 4127
3771 case OP_LET1REC: /* letrec (calculate parameters) */ 4128 /* OP_LET1REC handled by OP_LET1 */
3772 args = cons (SCHEME_V->value, args);
3773
3774 if (is_pair (SCHEME_V->code)) /* continue */
3775 {
3776 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3777 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3778
3779 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3780 SCHEME_V->code = cadar (SCHEME_V->code);
3781 SCHEME_V->args = NIL;
3782 s_goto (OP_EVAL);
3783 }
3784 else /* end */
3785 {
3786 args = reverse_in_place (SCHEME_A_ NIL, args);
3787 SCHEME_V->code = car (args);
3788 SCHEME_V->args = cdr (args);
3789 s_goto (OP_LET2REC);
3790 }
3791 4129
3792 case OP_LET2REC: /* letrec */ 4130 case OP_LET2REC: /* letrec */
3793 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y)) 4131 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3794 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4132 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3795 4133
… …
3825 } 4163 }
3826 else 4164 else
3827 { 4165 {
3828 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4166 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3829 s_return (NIL); 4167 s_return (NIL);
3830 else 4168
3831 {
3832 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4169 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3833 SCHEME_V->code = caar (SCHEME_V->code); 4170 SCHEME_V->code = caar (SCHEME_V->code);
3834 s_goto (OP_EVAL); 4171 s_goto (OP_EVAL);
3835 }
3836 } 4172 }
3837 4173
3838 case OP_DELAY: /* delay */ 4174 case OP_DELAY: /* delay */
3839 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 4175 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3840 set_typeflag (x, T_PROMISE); 4176 set_typeflag (x, T_PROMISE);
… …
3851 case OP_AND1: /* and */ 4187 case OP_AND1: /* and */
3852 if (is_false (SCHEME_V->value)) 4188 if (is_false (SCHEME_V->value))
3853 s_return (SCHEME_V->value); 4189 s_return (SCHEME_V->value);
3854 else if (SCHEME_V->code == NIL) 4190 else if (SCHEME_V->code == NIL)
3855 s_return (SCHEME_V->value); 4191 s_return (SCHEME_V->value);
3856 else 4192
3857 {
3858 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4193 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3859 SCHEME_V->code = car (SCHEME_V->code); 4194 SCHEME_V->code = car (SCHEME_V->code);
3860 s_goto (OP_EVAL); 4195 s_goto (OP_EVAL);
3861 }
3862 4196
3863 case OP_OR0: /* or */ 4197 case OP_OR0: /* or */
3864 if (SCHEME_V->code == NIL) 4198 if (SCHEME_V->code == NIL)
3865 s_return (S_F); 4199 s_return (S_F);
3866 4200
… …
3871 case OP_OR1: /* or */ 4205 case OP_OR1: /* or */
3872 if (is_true (SCHEME_V->value)) 4206 if (is_true (SCHEME_V->value))
3873 s_return (SCHEME_V->value); 4207 s_return (SCHEME_V->value);
3874 else if (SCHEME_V->code == NIL) 4208 else if (SCHEME_V->code == NIL)
3875 s_return (SCHEME_V->value); 4209 s_return (SCHEME_V->value);
3876 else 4210
3877 {
3878 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4211 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3879 SCHEME_V->code = car (SCHEME_V->code); 4212 SCHEME_V->code = car (SCHEME_V->code);
3880 s_goto (OP_EVAL); 4213 s_goto (OP_EVAL);
3881 }
3882 4214
3883 case OP_C0STREAM: /* cons-stream */ 4215 case OP_C0STREAM: /* cons-stream */
3884 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4216 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3885 SCHEME_V->code = car (SCHEME_V->code); 4217 SCHEME_V->code = car (SCHEME_V->code);
3886 s_goto (OP_EVAL); 4218 s_goto (OP_EVAL);
… …
3951 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4283 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3952 SCHEME_V->code = caar (x); 4284 SCHEME_V->code = caar (x);
3953 s_goto (OP_EVAL); 4285 s_goto (OP_EVAL);
3954 } 4286 }
3955 } 4287 }
3956 else 4288
3957 s_return (NIL); 4289 s_return (NIL);
3958 4290
3959 case OP_CASE2: /* case */ 4291 case OP_CASE2: /* case */
3960 if (is_true (SCHEME_V->value)) 4292 if (is_true (SCHEME_V->value))
3961 s_goto (OP_BEGIN); 4293 s_goto (OP_BEGIN);
3962 else 4294
3963 s_return (NIL); 4295 s_return (NIL);
3964 4296
3965 case OP_PAPPLY: /* apply */ 4297 case OP_PAPPLY: /* apply */
3966 SCHEME_V->code = car (args); 4298 SCHEME_V->code = car (args);
3967 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4299 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3968 /*SCHEME_V->args = cadr(args); */ 4300 /*SCHEME_V->args = cadr(args); */
… …
3982 } 4314 }
3983 4315
3984 if (USE_ERROR_CHECKING) abort (); 4316 if (USE_ERROR_CHECKING) abort ();
3985} 4317}
3986 4318
3987static int 4319/* math, cxr */
4320ecb_hot static int
3988opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4321opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3989{ 4322{
3990 pointer args = SCHEME_V->args; 4323 pointer args = SCHEME_V->args;
3991 pointer x = car (args); 4324 pointer x = car (args);
3992 num v; 4325 num v;
3993 4326
3994 switch (op) 4327 switch (op)
3995 { 4328 {
3996#if USE_MATH 4329#if USE_MATH
3997 case OP_INEX2EX: /* inexact->exact */ 4330 case OP_INEX2EX: /* inexact->exact */
3998 {
3999 if (is_integer (x)) 4331 if (!is_integer (x))
4000 s_return (x); 4332 {
4001
4002 RVALUE r = rvalue_unchecked (x); 4333 RVALUE r = rvalue_unchecked (x);
4003 4334
4004 if (r == (RVALUE)(IVALUE)r) 4335 if (r == (RVALUE)(IVALUE)r)
4005 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4336 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
4006 else 4337 else
4007 Error_1 ("inexact->exact: not integral:", x); 4338 Error_1 ("inexact->exact: not integral:", x);
4008 } 4339 }
4009 4340
4341 s_return (x);
4342
4343 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4344 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4345 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4346 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4347
4348 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4010 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4349 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4011 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4350 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4351 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
4012 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4352 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4013 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4353 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4014 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4354 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4015 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4355 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4016 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4356 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4017 4357
4018 case OP_ATAN: 4358 case OP_ATAN:
4359 s_return (mk_real (SCHEME_A_
4019 if (cdr (args) == NIL) 4360 cdr (args) == NIL
4020 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4361 ? atan (rvalue (x))
4021 else 4362 : atan2 (rvalue (x), rvalue (cadr (args)))));
4022 {
4023 pointer y = cadr (args);
4024 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4025 }
4026
4027 case OP_SQRT:
4028 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4029 4363
4030 case OP_EXPT: 4364 case OP_EXPT:
4031 { 4365 {
4032 RVALUE result; 4366 RVALUE result;
4033 int real_result = 1; 4367 int real_result = 1;
… …
4056 if (real_result) 4390 if (real_result)
4057 s_return (mk_real (SCHEME_A_ result)); 4391 s_return (mk_real (SCHEME_A_ result));
4058 else 4392 else
4059 s_return (mk_integer (SCHEME_A_ result)); 4393 s_return (mk_integer (SCHEME_A_ result));
4060 } 4394 }
4061
4062 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4063 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4064
4065 case OP_TRUNCATE:
4066 {
4067 RVALUE n = rvalue (x);
4068 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4069 }
4070
4071 case OP_ROUND:
4072 if (is_integer (x))
4073 s_return (x);
4074
4075 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4076#endif 4395#endif
4077 4396
4078 case OP_ADD: /* + */ 4397 case OP_ADD: /* + */
4079 v = num_zero; 4398 v = num_zero;
4080 4399
… …
4168 else 4487 else
4169 Error_0 ("modulo: division by zero"); 4488 Error_0 ("modulo: division by zero");
4170 4489
4171 s_return (mk_number (SCHEME_A_ v)); 4490 s_return (mk_number (SCHEME_A_ v));
4172 4491
4173 case OP_CAR: /* car */ 4492 /* the compiler will optimize this mess... */
4174 s_return (caar (args)); 4493 case OP_CAR: op_car: s_return (car (x));
4175 4494 case OP_CDR: op_cdr: s_return (cdr (x));
4176 case OP_CDR: /* cdr */ 4495 case OP_CAAR: op_caar: x = car (x); goto op_car;
4177 s_return (cdar (args)); 4496 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4497 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4498 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4499 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4500 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4501 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4502 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4503 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4504 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4505 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4506 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4507 case OP_CAAAAR: x = car (x); goto op_caaar;
4508 case OP_CAAADR: x = cdr (x); goto op_caaar;
4509 case OP_CAADAR: x = car (x); goto op_caadr;
4510 case OP_CAADDR: x = cdr (x); goto op_caadr;
4511 case OP_CADAAR: x = car (x); goto op_cadar;
4512 case OP_CADADR: x = cdr (x); goto op_cadar;
4513 case OP_CADDAR: x = car (x); goto op_caddr;
4514 case OP_CADDDR: x = cdr (x); goto op_caddr;
4515 case OP_CDAAAR: x = car (x); goto op_cdaar;
4516 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4517 case OP_CDADAR: x = car (x); goto op_cdadr;
4518 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4519 case OP_CDDAAR: x = car (x); goto op_cddar;
4520 case OP_CDDADR: x = cdr (x); goto op_cddar;
4521 case OP_CDDDAR: x = car (x); goto op_cdddr;
4522 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4178 4523
4179 case OP_CONS: /* cons */ 4524 case OP_CONS: /* cons */
4180 set_cdr (args, cadr (args)); 4525 set_cdr (args, cadr (args));
4181 s_return (args); 4526 s_return (args);
4182 4527
… …
4356 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4701 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4357 4702
4358 s_return (newstr); 4703 s_return (newstr);
4359 } 4704 }
4360 4705
4361 case OP_SUBSTR: /* substring */ 4706 case OP_STRING_COPY: /* substring/string-copy */
4362 { 4707 {
4363 char *str = strvalue (x); 4708 char *str = strvalue (x);
4364 int index0 = ivalue_unchecked (cadr (args)); 4709 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4365 int index1; 4710 int index1;
4366 int len; 4711 int len;
4367 4712
4368 if (index0 > strlength (x)) 4713 if (index0 > strlength (x))
4369 Error_1 ("substring: start out of bounds:", cadr (args)); 4714 Error_1 ("string->copy: start out of bounds:", cadr (args));
4370 4715
4371 if (cddr (args) != NIL) 4716 if (cddr (args) != NIL)
4372 { 4717 {
4373 index1 = ivalue_unchecked (caddr (args)); 4718 index1 = ivalue_unchecked (caddr (args));
4374 4719
4375 if (index1 > strlength (x) || index1 < index0) 4720 if (index1 > strlength (x) || index1 < index0)
4376 Error_1 ("substring: end out of bounds:", caddr (args)); 4721 Error_1 ("string->copy: end out of bounds:", caddr (args));
4377 } 4722 }
4378 else 4723 else
4379 index1 = strlength (x); 4724 index1 = strlength (x);
4380 4725
4381 len = index1 - index0; 4726 len = index1 - index0;
4382 x = mk_empty_string (SCHEME_A_ len, ' '); 4727 x = mk_counted_string (SCHEME_A_ str + index0, len);
4383 memcpy (strvalue (x), str + index0, len);
4384 strvalue (x)[len] = 0;
4385 4728
4386 s_return (x); 4729 s_return (x);
4387 } 4730 }
4388 4731
4389 case OP_VECTOR: /* vector */ 4732 case OP_VECTOR: /* vector */
… …
4401 if (SCHEME_V->no_memory) 4744 if (SCHEME_V->no_memory)
4402 s_return (S_SINK); 4745 s_return (S_SINK);
4403#endif 4746#endif
4404 4747
4405 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4748 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4406 set_vector_elem (vec, i, car (x)); 4749 vector_set (vec, i, car (x));
4407 4750
4408 s_return (vec); 4751 s_return (vec);
4409 } 4752 }
4410 4753
4411 case OP_MKVECTOR: /* make-vector */ 4754 case OP_MKVECTOR: /* make-vector */
… …
4423 if (SCHEME_V->no_memory) 4766 if (SCHEME_V->no_memory)
4424 s_return (S_SINK); 4767 s_return (S_SINK);
4425#endif 4768#endif
4426 4769
4427 if (fill != NIL) 4770 if (fill != NIL)
4428 fill_vector (vec, fill); 4771 fill_vector (vec, 0, fill);
4429 4772
4430 s_return (vec); 4773 s_return (vec);
4431 } 4774 }
4432 4775
4433 case OP_VECLEN: /* vector-length */ 4776 case OP_VECLEN: /* vector-length */
4434 s_return (mk_integer (SCHEME_A_ veclength (x))); 4777 s_return (mk_integer (SCHEME_A_ veclength (x)));
4778
4779 case OP_VECRESIZE:
4780 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4781 s_return (x);
4435 4782
4436 case OP_VECREF: /* vector-ref */ 4783 case OP_VECREF: /* vector-ref */
4437 { 4784 {
4438 int index = ivalue_unchecked (cadr (args)); 4785 int index = ivalue_unchecked (cadr (args));
4439 4786
4440 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4787 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4441 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4788 Error_1 ("vector-ref: out of bounds:", cadr (args));
4442 4789
4443 s_return (vector_elem (x, index)); 4790 s_return (vector_get (x, index));
4444 } 4791 }
4445 4792
4446 case OP_VECSET: /* vector-set! */ 4793 case OP_VECSET: /* vector-set! */
4447 { 4794 {
4448 int index = ivalue_unchecked (cadr (args)); 4795 int index = ivalue_unchecked (cadr (args));
… …
4451 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4798 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4452 4799
4453 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4800 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4454 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4801 Error_1 ("vector-set!: out of bounds:", cadr (args));
4455 4802
4456 set_vector_elem (x, index, caddr (args)); 4803 vector_set (x, index, caddr (args));
4457 s_return (x); 4804 s_return (x);
4458 } 4805 }
4459 } 4806 }
4460 4807
4461 if (USE_ERROR_CHECKING) abort (); 4808 if (USE_ERROR_CHECKING) abort ();
4462} 4809}
4463 4810
4464static int 4811/* relational ops */
4812ecb_hot static int
4465opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4813opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4466{ 4814{
4467 pointer x = SCHEME_V->args; 4815 pointer x = SCHEME_V->args;
4468 4816
4469 for (;;) 4817 for (;;)
… …
4490 } 4838 }
4491 4839
4492 s_return (S_T); 4840 s_return (S_T);
4493} 4841}
4494 4842
4495static int 4843/* predicates */
4844ecb_hot static int
4496opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4845opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4497{ 4846{
4498 pointer args = SCHEME_V->args; 4847 pointer args = SCHEME_V->args;
4499 pointer a = car (args); 4848 pointer a = car (args);
4500 pointer d = cdr (args); 4849 pointer d = cdr (args);
4501 int r; 4850 int r;
4502 4851
4503 switch (op) 4852 switch (op)
4504 { 4853 {
4505 case OP_NOT: /* not */ r = is_false (a) ; break; 4854 case OP_NOT: /* not */ r = is_false (a) ; break;
4506 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4855 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4507 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4856 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4508 case OP_NULLP: /* null? */ r = a == NIL ; break; 4857 case OP_NULLP: /* null? */ r = a == NIL ; break;
4509 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4858 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4859 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4510 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4860 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4511 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4861 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4512 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4862 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4513 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4863 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4514 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4864 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4515 4865
4516#if USE_CHAR_CLASSIFIERS 4866#if USE_CHAR_CLASSIFIERS
4517 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4867 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4518 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4868 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4519 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4869 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
… …
4546 } 4896 }
4547 4897
4548 s_retbool (r); 4898 s_retbool (r);
4549} 4899}
4550 4900
4551static int 4901/* promises, list ops, ports */
4902ecb_hot static int
4552opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4903opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4553{ 4904{
4554 pointer args = SCHEME_V->args; 4905 pointer args = SCHEME_V->args;
4555 pointer a = car (args); 4906 pointer a = car (args);
4556 pointer x, y; 4907 pointer x, y;
… …
4569 } 4920 }
4570 else 4921 else
4571 s_return (SCHEME_V->code); 4922 s_return (SCHEME_V->code);
4572 4923
4573 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4924 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4574 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4925 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4575 s_return (SCHEME_V->value); 4926 s_return (SCHEME_V->value);
4576 4927
4577#if USE_PORTS 4928#if USE_PORTS
4929
4930 case OP_EOF_OBJECT: /* eof-object */
4931 s_return (S_EOF);
4578 4932
4579 case OP_WRITE: /* write */ 4933 case OP_WRITE: /* write */
4580 case OP_DISPLAY: /* display */ 4934 case OP_DISPLAY: /* display */
4581 case OP_WRITE_CHAR: /* write-char */ 4935 case OP_WRITE_CHAR: /* write-char */
4582 if (is_pair (cdr (SCHEME_V->args))) 4936 if (is_pair (cdr (SCHEME_V->args)))
… …
4596 else 4950 else
4597 SCHEME_V->print_flag = 0; 4951 SCHEME_V->print_flag = 0;
4598 4952
4599 s_goto (OP_P0LIST); 4953 s_goto (OP_P0LIST);
4600 4954
4955 //TODO: move to scheme
4601 case OP_NEWLINE: /* newline */ 4956 case OP_NEWLINE: /* newline */
4602 if (is_pair (args)) 4957 if (is_pair (args))
4603 { 4958 {
4604 if (a != SCHEME_V->outport) 4959 if (a != SCHEME_V->outport)
4605 { 4960 {
… …
4607 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4962 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4608 SCHEME_V->outport = a; 4963 SCHEME_V->outport = a;
4609 } 4964 }
4610 } 4965 }
4611 4966
4612 putstr (SCHEME_A_ "\n"); 4967 putcharacter (SCHEME_A_ '\n');
4613 s_return (S_T); 4968 s_return (S_T);
4614#endif 4969#endif
4615 4970
4616 case OP_ERR0: /* error */ 4971 case OP_ERR0: /* error */
4617 SCHEME_V->retcode = -1; 4972 SCHEME_V->retcode = -1;
… …
4626 putstr (SCHEME_A_ strvalue (car (args))); 4981 putstr (SCHEME_A_ strvalue (car (args)));
4627 SCHEME_V->args = cdr (args); 4982 SCHEME_V->args = cdr (args);
4628 s_goto (OP_ERR1); 4983 s_goto (OP_ERR1);
4629 4984
4630 case OP_ERR1: /* error */ 4985 case OP_ERR1: /* error */
4631 putstr (SCHEME_A_ " "); 4986 putcharacter (SCHEME_A_ ' ');
4632 4987
4633 if (args != NIL) 4988 if (args != NIL)
4634 { 4989 {
4635 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 4990 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4636 SCHEME_V->args = a; 4991 SCHEME_V->args = a;
4637 SCHEME_V->print_flag = 1; 4992 SCHEME_V->print_flag = 1;
4638 s_goto (OP_P0LIST); 4993 s_goto (OP_P0LIST);
4639 } 4994 }
4640 else 4995 else
4641 { 4996 {
4642 putstr (SCHEME_A_ "\n"); 4997 putcharacter (SCHEME_A_ '\n');
4643 4998
4644 if (SCHEME_V->interactive_repl) 4999 if (SCHEME_V->interactive_repl)
4645 s_goto (OP_T0LVL); 5000 s_goto (OP_T0LVL);
4646 else 5001 else
4647 return -1; 5002 return -1;
… …
4709 5064
4710 case OP_QUIT: /* quit */ 5065 case OP_QUIT: /* quit */
4711 if (is_pair (args)) 5066 if (is_pair (args))
4712 SCHEME_V->retcode = ivalue (a); 5067 SCHEME_V->retcode = ivalue (a);
4713 5068
4714 exit(0);//D
4715 return -1; 5069 return -1;
4716 5070
4717 case OP_GC: /* gc */ 5071 case OP_GC: /* gc */
4718 gc (SCHEME_A_ NIL, NIL); 5072 gc (SCHEME_A_ NIL, NIL);
4719 s_return (S_T); 5073 s_return (S_T);
… …
4725 SCHEME_V->gc_verbose = (a != S_F); 5079 SCHEME_V->gc_verbose = (a != S_F);
4726 s_retbool (was); 5080 s_retbool (was);
4727 } 5081 }
4728 5082
4729 case OP_NEWSEGMENT: /* new-segment */ 5083 case OP_NEWSEGMENT: /* new-segment */
5084#if 0
4730 if (!is_pair (args) || !is_number (a)) 5085 if (!is_pair (args) || !is_number (a))
4731 Error_0 ("new-segment: argument must be a number"); 5086 Error_0 ("new-segment: argument must be a number");
4732 5087#endif
4733 alloc_cellseg (SCHEME_A_ ivalue (a)); 5088 s_retbool (alloc_cellseg (SCHEME_A));
4734
4735 s_return (S_T);
4736 5089
4737 case OP_OBLIST: /* oblist */ 5090 case OP_OBLIST: /* oblist */
4738 s_return (oblist_all_symbols (SCHEME_A)); 5091 s_return (oblist_all_symbols (SCHEME_A));
4739 5092
4740#if USE_PORTS 5093#if USE_PORTS
… …
4810 s_return (p == NIL ? S_F : p); 5163 s_return (p == NIL ? S_F : p);
4811 } 5164 }
4812 5165
4813 case OP_GET_OUTSTRING: /* get-output-string */ 5166 case OP_GET_OUTSTRING: /* get-output-string */
4814 { 5167 {
4815 port *p; 5168 port *p = port (a);
4816 5169
4817 if ((p = a->object.port)->kind & port_string) 5170 if (p->kind & port_string)
4818 { 5171 {
4819 off_t size; 5172 off_t size;
4820 char *str; 5173 char *str;
4821 5174
4822 size = p->rep.string.curr - p->rep.string.start + 1; 5175 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4857 } 5210 }
4858 5211
4859 if (USE_ERROR_CHECKING) abort (); 5212 if (USE_ERROR_CHECKING) abort ();
4860} 5213}
4861 5214
4862static int 5215/* reading */
5216ecb_cold static int
4863opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5217opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4864{ 5218{
4865 pointer args = SCHEME_V->args; 5219 pointer args = SCHEME_V->args;
4866 pointer x; 5220 pointer x;
4867 5221
… …
4927 int res; 5281 int res;
4928 5282
4929 if (is_pair (args)) 5283 if (is_pair (args))
4930 p = car (args); 5284 p = car (args);
4931 5285
4932 res = p->object.port->kind & port_string; 5286 res = port (p)->kind & port_string;
4933 5287
4934 s_retbool (res); 5288 s_retbool (res);
4935 } 5289 }
4936 5290
4937 case OP_SET_INPORT: /* set-input-port */ 5291 case OP_SET_INPORT: /* set-input-port */
… …
4946 case OP_RDSEXPR: 5300 case OP_RDSEXPR:
4947 switch (SCHEME_V->tok) 5301 switch (SCHEME_V->tok)
4948 { 5302 {
4949 case TOK_EOF: 5303 case TOK_EOF:
4950 s_return (S_EOF); 5304 s_return (S_EOF);
4951 /* NOTREACHED */
4952 5305
4953 case TOK_VEC: 5306 case TOK_VEC:
4954 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5307 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
4955 /* fall through */ 5308 /* fall through */
4956 5309
… …
4959 5312
4960 if (SCHEME_V->tok == TOK_RPAREN) 5313 if (SCHEME_V->tok == TOK_RPAREN)
4961 s_return (NIL); 5314 s_return (NIL);
4962 else if (SCHEME_V->tok == TOK_DOT) 5315 else if (SCHEME_V->tok == TOK_DOT)
4963 Error_0 ("syntax error: illegal dot expression"); 5316 Error_0 ("syntax error: illegal dot expression");
4964 else 5317
4965 {
4966 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5318 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
4967 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5319 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
4968 s_goto (OP_RDSEXPR); 5320 s_goto (OP_RDSEXPR);
4969 }
4970 5321
4971 case TOK_QUOTE: 5322 case TOK_QUOTE:
4972 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5323 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
4973 SCHEME_V->tok = token (SCHEME_A); 5324 SCHEME_V->tok = token (SCHEME_A);
4974 s_goto (OP_RDSEXPR); 5325 s_goto (OP_RDSEXPR);
… …
4980 { 5331 {
4981 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5332 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
4982 SCHEME_V->tok = TOK_LPAREN; 5333 SCHEME_V->tok = TOK_LPAREN;
4983 s_goto (OP_RDSEXPR); 5334 s_goto (OP_RDSEXPR);
4984 } 5335 }
4985 else 5336
4986 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5337 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
4987
4988 s_goto (OP_RDSEXPR); 5338 s_goto (OP_RDSEXPR);
4989 5339
4990 case TOK_COMMA: 5340 case TOK_COMMA:
4991 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5341 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
4992 SCHEME_V->tok = token (SCHEME_A); 5342 SCHEME_V->tok = token (SCHEME_A);
… …
4996 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5346 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4997 SCHEME_V->tok = token (SCHEME_A); 5347 SCHEME_V->tok = token (SCHEME_A);
4998 s_goto (OP_RDSEXPR); 5348 s_goto (OP_RDSEXPR);
4999 5349
5000 case TOK_ATOM: 5350 case TOK_ATOM:
5001 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5351 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5352
5353 case TOK_DOTATOM:
5354 SCHEME_V->strbuff[0] = '.';
5355 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5356
5357 case TOK_STRATOM:
5358 //TODO: haven't checked whether the garbage collector could interfere and free x
5359 gc (SCHEME_A_ NIL, NIL); //TODO: superheavyhanded
5360 x = readstrexp (SCHEME_A_ '|');
5361 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5002 5362
5003 case TOK_DQUOTE: 5363 case TOK_DQUOTE:
5004 x = readstrexp (SCHEME_A); 5364 x = readstrexp (SCHEME_A_ '"');
5005 5365
5006 if (x == S_F) 5366 if (x == S_F)
5007 Error_0 ("Error reading string"); 5367 Error_0 ("Error reading string");
5008 5368
5009 setimmutable (x); 5369 setimmutable (x);
… …
5013 { 5373 {
5014 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1); 5374 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1);
5015 5375
5016 if (f == NIL) 5376 if (f == NIL)
5017 Error_0 ("undefined sharp expression"); 5377 Error_0 ("undefined sharp expression");
5018 else 5378
5019 {
5020 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5379 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
5021 s_goto (OP_EVAL); 5380 s_goto (OP_EVAL);
5022 }
5023 } 5381 }
5024 5382
5025 case TOK_SHARP_CONST: 5383 case TOK_SHARP_CONST:
5026 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5384 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5027 Error_0 ("undefined sharp expression"); 5385 Error_0 ("undefined sharp expression");
5028 else 5386
5029 s_return (x); 5387 s_return (x);
5030 5388
5031 default: 5389 default:
5032 Error_0 ("syntax error: illegal token"); 5390 Error_0 ("syntax error: illegal token");
5033 } 5391 }
5034 5392
… …
5127 pointer b = cdr (args); 5485 pointer b = cdr (args);
5128 int ok_abbr = ok_abbrev (b); 5486 int ok_abbr = ok_abbrev (b);
5129 SCHEME_V->args = car (b); 5487 SCHEME_V->args = car (b);
5130 5488
5131 if (a == SCHEME_V->QUOTE && ok_abbr) 5489 if (a == SCHEME_V->QUOTE && ok_abbr)
5132 putstr (SCHEME_A_ "'"); 5490 putcharacter (SCHEME_A_ '\'');
5133 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5491 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5134 putstr (SCHEME_A_ "`"); 5492 putcharacter (SCHEME_A_ '`');
5135 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5493 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5136 putstr (SCHEME_A_ ","); 5494 putcharacter (SCHEME_A_ ',');
5137 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5495 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5138 putstr (SCHEME_A_ ",@"); 5496 putstr (SCHEME_A_ ",@");
5139 else 5497 else
5140 { 5498 {
5141 putstr (SCHEME_A_ "("); 5499 putcharacter (SCHEME_A_ '(');
5142 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5500 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5143 SCHEME_V->args = a; 5501 SCHEME_V->args = a;
5144 } 5502 }
5145 5503
5146 s_goto (OP_P0LIST); 5504 s_goto (OP_P0LIST);
… …
5148 5506
5149 case OP_P1LIST: 5507 case OP_P1LIST:
5150 if (is_pair (args)) 5508 if (is_pair (args))
5151 { 5509 {
5152 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5510 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5153 putstr (SCHEME_A_ " "); 5511 putcharacter (SCHEME_A_ ' ');
5154 SCHEME_V->args = car (args); 5512 SCHEME_V->args = car (args);
5155 s_goto (OP_P0LIST); 5513 s_goto (OP_P0LIST);
5156 } 5514 }
5157 else if (is_vector (args)) 5515 else if (is_vector (args))
5158 { 5516 {
… …
5166 { 5524 {
5167 putstr (SCHEME_A_ " . "); 5525 putstr (SCHEME_A_ " . ");
5168 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5526 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5169 } 5527 }
5170 5528
5171 putstr (SCHEME_A_ ")"); 5529 putcharacter (SCHEME_A_ ')');
5172 s_return (S_T); 5530 s_return (S_T);
5173 } 5531 }
5174 5532
5175 case OP_PVECFROM: 5533 case OP_PVECFROM:
5176 { 5534 {
… …
5178 pointer vec = car (args); 5536 pointer vec = car (args);
5179 int len = veclength (vec); 5537 int len = veclength (vec);
5180 5538
5181 if (i == len) 5539 if (i == len)
5182 { 5540 {
5183 putstr (SCHEME_A_ ")"); 5541 putcharacter (SCHEME_A_ ')');
5184 s_return (S_T); 5542 s_return (S_T);
5185 } 5543 }
5186 else 5544 else
5187 { 5545 {
5188 pointer elem = vector_elem (vec, i); 5546 pointer elem = vector_get (vec, i);
5189 5547
5190 ivalue_unchecked (cdr (args)) = i + 1; 5548 ivalue_unchecked (cdr (args)) = i + 1;
5191 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5549 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5192 SCHEME_V->args = elem; 5550 SCHEME_V->args = elem;
5193 5551
5194 if (i > 0) 5552 if (i > 0)
5195 putstr (SCHEME_A_ " "); 5553 putcharacter (SCHEME_A_ ' ');
5196 5554
5197 s_goto (OP_P0LIST); 5555 s_goto (OP_P0LIST);
5198 } 5556 }
5199 } 5557 }
5200 } 5558 }
5201 5559
5202 if (USE_ERROR_CHECKING) abort (); 5560 if (USE_ERROR_CHECKING) abort ();
5203} 5561}
5204 5562
5205static int 5563/* list ops */
5564ecb_hot static int
5206opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5565opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5207{ 5566{
5208 pointer args = SCHEME_V->args; 5567 pointer args = SCHEME_V->args;
5209 pointer a = car (args); 5568 pointer a = car (args);
5210 pointer x, y; 5569 pointer x, y;
… …
5233 break; 5592 break;
5234 } 5593 }
5235 5594
5236 if (is_pair (y)) 5595 if (is_pair (y))
5237 s_return (car (y)); 5596 s_return (car (y));
5238 else 5597
5239 s_return (S_F); 5598 s_return (S_F);
5240
5241 5599
5242 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5600 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5243 SCHEME_V->args = a; 5601 SCHEME_V->args = a;
5244 5602
5245 if (SCHEME_V->args == NIL) 5603 if (SCHEME_V->args == NIL)
5246 s_return (S_F); 5604 s_return (S_F);
5247 else if (is_closure (SCHEME_V->args)) 5605 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5248 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5606 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5249 else if (is_macro (SCHEME_V->args)) 5607
5250 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5251 else
5252 s_return (S_F); 5608 s_return (S_F);
5253 5609
5254 case OP_CLOSUREP: /* closure? */ 5610 case OP_CLOSUREP: /* closure? */
5255 /* 5611 /*
5256 * Note, macro object is also a closure. 5612 * Note, macro object is also a closure.
5257 * Therefore, (closure? <#MACRO>) ==> #t 5613 * Therefore, (closure? <#MACRO>) ==> #t
5614 * (schmorp) well, obviously not, fix? TODO
5258 */ 5615 */
5259 s_retbool (is_closure (a)); 5616 s_retbool (is_closure (a));
5260 5617
5261 case OP_MACROP: /* macro? */ 5618 case OP_MACROP: /* macro? */
5262 s_retbool (is_macro (a)); 5619 s_retbool (is_macro (a));
… …
5267 5624
5268/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5625/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5269typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5626typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5270 5627
5271typedef int (*test_predicate)(pointer); 5628typedef int (*test_predicate)(pointer);
5272static int 5629
5630ecb_hot static int
5273tst_any (pointer p) 5631tst_any (pointer p)
5274{ 5632{
5275 return 1; 5633 return 1;
5276} 5634}
5277 5635
5278static int 5636ecb_hot static int
5279tst_inonneg (pointer p) 5637tst_inonneg (pointer p)
5280{ 5638{
5281 return is_integer (p) && ivalue_unchecked (p) >= 0; 5639 return is_integer (p) && ivalue_unchecked (p) >= 0;
5282} 5640}
5283 5641
5284static int 5642ecb_hot static int
5285tst_is_list (SCHEME_P_ pointer p) 5643tst_is_list (SCHEME_P_ pointer p)
5286{ 5644{
5287 return p == NIL || is_pair (p); 5645 return p == NIL || is_pair (p);
5288} 5646}
5289 5647
… …
5332#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5690#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5333#include "opdefines.h" 5691#include "opdefines.h"
5334#undef OP_DEF 5692#undef OP_DEF
5335; 5693;
5336 5694
5337static const char * 5695ecb_cold static const char *
5338opname (int idx) 5696opname (int idx)
5339{ 5697{
5340 const char *name = opnames; 5698 const char *name = opnames;
5341 5699
5342 /* should do this at compile time, but would require external program, right? */ 5700 /* should do this at compile time, but would require external program, right? */
… …
5344 name += strlen (name) + 1; 5702 name += strlen (name) + 1;
5345 5703
5346 return *name ? name : "ILLEGAL"; 5704 return *name ? name : "ILLEGAL";
5347} 5705}
5348 5706
5349static const char * 5707ecb_cold static const char *
5350procname (pointer x) 5708procname (pointer x)
5351{ 5709{
5352 return opname (procnum (x)); 5710 return opname (procnum (x));
5353} 5711}
5354 5712
… …
5374#undef OP_DEF 5732#undef OP_DEF
5375 {0} 5733 {0}
5376}; 5734};
5377 5735
5378/* kernel of this interpreter */ 5736/* kernel of this interpreter */
5379static void ecb_hot 5737ecb_hot static void
5380Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5738Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5381{ 5739{
5382 SCHEME_V->op = op; 5740 SCHEME_V->op = op;
5383 5741
5384 for (;;) 5742 for (;;)
… …
5431 { 5789 {
5432 if (!tests[j - 1].fct (arg)) 5790 if (!tests[j - 1].fct (arg))
5433 break; 5791 break;
5434 } 5792 }
5435 5793
5436 if (t[1]) /* last test is replicated as necessary */ 5794 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5437 t++; 5795 t++;
5438 5796
5439 arglist = cdr (arglist); 5797 arglist = cdr (arglist);
5440 i++; 5798 i++;
5441 } 5799 }
… …
5467 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5825 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5468 return; 5826 return;
5469 5827
5470 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5828 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5471 { 5829 {
5472 xwrstr ("No memory!\n"); 5830 putstr (SCHEME_A_ "No memory!\n");
5473 return; 5831 return;
5474 } 5832 }
5475 } 5833 }
5476} 5834}
5477 5835
5478/* ========== Initialization of internal keywords ========== */ 5836/* ========== Initialization of internal keywords ========== */
5479 5837
5480static void 5838ecb_cold static void
5481assign_syntax (SCHEME_P_ const char *name) 5839assign_syntax (SCHEME_P_ const char *name)
5482{ 5840{
5483 pointer x = oblist_add_by_name (SCHEME_A_ name); 5841 pointer x = oblist_add_by_name (SCHEME_A_ name);
5484 set_typeflag (x, typeflag (x) | T_SYNTAX); 5842 set_typeflag (x, typeflag (x) | T_SYNTAX);
5485} 5843}
5486 5844
5487static void 5845ecb_cold static void
5488assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5846assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5489{ 5847{
5490 pointer x = mk_symbol (SCHEME_A_ name); 5848 pointer x = mk_symbol (SCHEME_A_ name);
5491 pointer y = mk_proc (SCHEME_A_ op); 5849 pointer y = mk_proc (SCHEME_A_ op);
5492 new_slot_in_env (SCHEME_A_ x, y); 5850 new_slot_in_env (SCHEME_A_ x, y);
… …
5500 ivalue_unchecked (y) = op; 5858 ivalue_unchecked (y) = op;
5501 return y; 5859 return y;
5502} 5860}
5503 5861
5504/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5862/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5505static int 5863ecb_hot static int
5506syntaxnum (pointer p) 5864syntaxnum (pointer p)
5507{ 5865{
5508 const char *s = strvalue (car (p)); 5866 const char *s = strvalue (p);
5509 5867
5510 switch (strlength (car (p))) 5868 switch (strlength (p))
5511 { 5869 {
5512 case 2: 5870 case 2:
5513 if (s[0] == 'i') 5871 if (s[0] == 'i')
5514 return OP_IF0; /* if */ 5872 return OP_IF0; /* if */
5515 else 5873 else
… …
5590ecb_cold int 5948ecb_cold int
5591scheme_init (SCHEME_P) 5949scheme_init (SCHEME_P)
5592{ 5950{
5593 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5951 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5594 pointer x; 5952 pointer x;
5953
5954 /* this memset is not strictly correct, as we assume (intcache)
5955 * that memset 0 will also set pointers to 0, but memset does
5956 * of course not guarantee that. screw such systems.
5957 */
5958 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5595 5959
5596 num_set_fixnum (num_zero, 1); 5960 num_set_fixnum (num_zero, 1);
5597 num_set_ivalue (num_zero, 0); 5961 num_set_ivalue (num_zero, 0);
5598 num_set_fixnum (num_one, 1); 5962 num_set_fixnum (num_one, 1);
5599 num_set_ivalue (num_one, 1); 5963 num_set_ivalue (num_one, 1);
… …
5611 SCHEME_V->save_inport = NIL; 5975 SCHEME_V->save_inport = NIL;
5612 SCHEME_V->loadport = NIL; 5976 SCHEME_V->loadport = NIL;
5613 SCHEME_V->nesting = 0; 5977 SCHEME_V->nesting = 0;
5614 SCHEME_V->interactive_repl = 0; 5978 SCHEME_V->interactive_repl = 0;
5615 5979
5616 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5980 if (!alloc_cellseg (SCHEME_A))
5617 { 5981 {
5618#if USE_ERROR_CHECKING 5982#if USE_ERROR_CHECKING
5619 SCHEME_V->no_memory = 1; 5983 SCHEME_V->no_memory = 1;
5620 return 0; 5984 return 0;
5621#endif 5985#endif
5622 } 5986 }
5623 5987
5624 SCHEME_V->gc_verbose = 0; 5988 SCHEME_V->gc_verbose = 0;
5625 dump_stack_initialize (SCHEME_A); 5989 dump_stack_initialize (SCHEME_A);
5626 SCHEME_V->code = NIL; 5990 SCHEME_V->code = NIL;
5627 SCHEME_V->args = NIL; 5991 SCHEME_V->args = NIL;
5628 SCHEME_V->envir = NIL; 5992 SCHEME_V->envir = NIL;
5993 SCHEME_V->value = NIL;
5629 SCHEME_V->tracing = 0; 5994 SCHEME_V->tracing = 0;
5630 5995
5631 /* init NIL */ 5996 /* init NIL */
5632 set_typeflag (NIL, T_ATOM | T_MARK); 5997 set_typeflag (NIL, T_ATOM | T_MARK);
5633 set_car (NIL, NIL); 5998 set_car (NIL, NIL);
… …
5689 6054
5690 return !SCHEME_V->no_memory; 6055 return !SCHEME_V->no_memory;
5691} 6056}
5692 6057
5693#if USE_PORTS 6058#if USE_PORTS
5694void 6059ecb_cold void
5695scheme_set_input_port_file (SCHEME_P_ int fin) 6060scheme_set_input_port_file (SCHEME_P_ int fin)
5696{ 6061{
5697 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6062 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5698} 6063}
5699 6064
5700void 6065ecb_cold void
5701scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 6066scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5702{ 6067{
5703 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 6068 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5704} 6069}
5705 6070
5706void 6071ecb_cold void
5707scheme_set_output_port_file (SCHEME_P_ int fout) 6072scheme_set_output_port_file (SCHEME_P_ int fout)
5708{ 6073{
5709 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6074 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5710} 6075}
5711 6076
5712void 6077ecb_cold void
5713scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 6078scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5714{ 6079{
5715 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 6080 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5716} 6081}
5717#endif 6082#endif
5718 6083
5719void 6084ecb_cold void
5720scheme_set_external_data (SCHEME_P_ void *p) 6085scheme_set_external_data (SCHEME_P_ void *p)
5721{ 6086{
5722 SCHEME_V->ext_data = p; 6087 SCHEME_V->ext_data = p;
5723} 6088}
5724 6089
… …
5756 SCHEME_V->loadport = NIL; 6121 SCHEME_V->loadport = NIL;
5757 SCHEME_V->gc_verbose = 0; 6122 SCHEME_V->gc_verbose = 0;
5758 gc (SCHEME_A_ NIL, NIL); 6123 gc (SCHEME_A_ NIL, NIL);
5759 6124
5760 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6125 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5761 free (SCHEME_V->alloc_seg[i]); 6126 free (SCHEME_V->cell_seg[i]);
5762 6127
5763#if SHOW_ERROR_LINE 6128#if SHOW_ERROR_LINE
5764 for (i = 0; i <= SCHEME_V->file_i; i++) 6129 for (i = 0; i <= SCHEME_V->file_i; i++)
5765 {
5766 if (SCHEME_V->load_stack[i].kind & port_file) 6130 if (SCHEME_V->load_stack[i].kind & port_file)
5767 { 6131 {
5768 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6132 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5769 6133
5770 if (fname) 6134 if (fname)
5771 free (fname); 6135 free (fname);
5772 } 6136 }
5773 }
5774#endif 6137#endif
5775} 6138}
5776 6139
5777void 6140ecb_cold void
5778scheme_load_file (SCHEME_P_ int fin) 6141scheme_load_file (SCHEME_P_ int fin)
5779{ 6142{
5780 scheme_load_named_file (SCHEME_A_ fin, 0); 6143 scheme_load_named_file (SCHEME_A_ fin, 0);
5781} 6144}
5782 6145
5783void 6146ecb_cold void
5784scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6147scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5785{ 6148{
5786 dump_stack_reset (SCHEME_A); 6149 dump_stack_reset (SCHEME_A);
5787 SCHEME_V->envir = SCHEME_V->global_env; 6150 SCHEME_V->envir = SCHEME_V->global_env;
5788 SCHEME_V->file_i = 0; 6151 SCHEME_V->file_i = 0;
5789 SCHEME_V->load_stack[0].unget = -1; 6152 SCHEME_V->load_stack[0].unget = -1;
5790 SCHEME_V->load_stack[0].kind = port_input | port_file; 6153 SCHEME_V->load_stack[0].kind = port_input | port_file;
5791 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6154 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5792#if USE_PORTS
5793 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6155 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5794#endif
5795 SCHEME_V->retcode = 0; 6156 SCHEME_V->retcode = 0;
5796 6157
5797#if USE_PORTS
5798 if (fin == STDIN_FILENO) 6158 if (fin == STDIN_FILENO)
5799 SCHEME_V->interactive_repl = 1; 6159 SCHEME_V->interactive_repl = 1;
5800#endif
5801 6160
5802#if USE_PORTS 6161#if USE_PORTS
5803#if SHOW_ERROR_LINE 6162#if SHOW_ERROR_LINE
5804 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6163 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5805 6164
… …
5809#endif 6168#endif
5810 6169
5811 SCHEME_V->inport = SCHEME_V->loadport; 6170 SCHEME_V->inport = SCHEME_V->loadport;
5812 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6171 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5813 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6172 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6173
5814 set_typeflag (SCHEME_V->loadport, T_ATOM); 6174 set_typeflag (SCHEME_V->loadport, T_ATOM);
5815 6175
5816 if (SCHEME_V->retcode == 0) 6176 if (SCHEME_V->retcode == 0)
5817 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6177 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5818} 6178}
5819 6179
5820void 6180ecb_cold void
5821scheme_load_string (SCHEME_P_ const char *cmd) 6181scheme_load_string (SCHEME_P_ const char *cmd)
5822{ 6182{
6183#if USE_PORTs
5823 dump_stack_reset (SCHEME_A); 6184 dump_stack_reset (SCHEME_A);
5824 SCHEME_V->envir = SCHEME_V->global_env; 6185 SCHEME_V->envir = SCHEME_V->global_env;
5825 SCHEME_V->file_i = 0; 6186 SCHEME_V->file_i = 0;
5826 SCHEME_V->load_stack[0].kind = port_input | port_string; 6187 SCHEME_V->load_stack[0].kind = port_input | port_string;
5827 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */ 6188 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5828 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd); 6189 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5829 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 6190 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5830#if USE_PORTS
5831 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6191 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5832#endif
5833 SCHEME_V->retcode = 0; 6192 SCHEME_V->retcode = 0;
5834 SCHEME_V->interactive_repl = 0; 6193 SCHEME_V->interactive_repl = 0;
5835 SCHEME_V->inport = SCHEME_V->loadport; 6194 SCHEME_V->inport = SCHEME_V->loadport;
5836 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6195 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5837 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6196 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5838 set_typeflag (SCHEME_V->loadport, T_ATOM); 6197 set_typeflag (SCHEME_V->loadport, T_ATOM);
5839 6198
5840 if (SCHEME_V->retcode == 0) 6199 if (SCHEME_V->retcode == 0)
5841 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6200 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6201#else
6202 abort ();
6203#endif
5842} 6204}
5843 6205
5844void 6206ecb_cold void
5845scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6207scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5846{ 6208{
5847 pointer x; 6209 pointer x;
5848 6210
5849 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6211 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5854 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6216 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5855} 6217}
5856 6218
5857#if !STANDALONE 6219#if !STANDALONE
5858 6220
5859void 6221ecb_cold void
5860scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6222scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5861{ 6223{
5862 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6224 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5863} 6225}
5864 6226
5865void 6227ecb_cold void
5866scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6228scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5867{ 6229{
5868 int i; 6230 int i;
5869 6231
5870 for (i = 0; i < count; i++) 6232 for (i = 0; i < count; i++)
5871 scheme_register_foreign_func (SCHEME_A_ list + i); 6233 scheme_register_foreign_func (SCHEME_A_ list + i);
5872} 6234}
5873 6235
5874pointer 6236ecb_cold pointer
5875scheme_apply0 (SCHEME_P_ const char *procname) 6237scheme_apply0 (SCHEME_P_ const char *procname)
5876{ 6238{
5877 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6239 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5878} 6240}
5879 6241
5880void 6242ecb_cold void
5881save_from_C_call (SCHEME_P) 6243save_from_C_call (SCHEME_P)
5882{ 6244{
5883 pointer saved_data = cons (car (S_SINK), 6245 pointer saved_data = cons (car (S_SINK),
5884 cons (SCHEME_V->envir, 6246 cons (SCHEME_V->envir,
5885 SCHEME_V->dump)); 6247 SCHEME_V->dump));
… …
5889 /* Truncate the dump stack so TS will return here when done, not 6251 /* Truncate the dump stack so TS will return here when done, not
5890 directly resume pre-C-call operations. */ 6252 directly resume pre-C-call operations. */
5891 dump_stack_reset (SCHEME_A); 6253 dump_stack_reset (SCHEME_A);
5892} 6254}
5893 6255
5894void 6256ecb_cold void
5895restore_from_C_call (SCHEME_P) 6257restore_from_C_call (SCHEME_P)
5896{ 6258{
5897 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6259 set_car (S_SINK, caar (SCHEME_V->c_nest));
5898 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6260 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5899 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6261 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5900 /* Pop */ 6262 /* Pop */
5901 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6263 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5902} 6264}
5903 6265
5904/* "func" and "args" are assumed to be already eval'ed. */ 6266/* "func" and "args" are assumed to be already eval'ed. */
5905pointer 6267ecb_cold pointer
5906scheme_call (SCHEME_P_ pointer func, pointer args) 6268scheme_call (SCHEME_P_ pointer func, pointer args)
5907{ 6269{
5908 int old_repl = SCHEME_V->interactive_repl; 6270 int old_repl = SCHEME_V->interactive_repl;
5909 6271
5910 SCHEME_V->interactive_repl = 0; 6272 SCHEME_V->interactive_repl = 0;
… …
5917 SCHEME_V->interactive_repl = old_repl; 6279 SCHEME_V->interactive_repl = old_repl;
5918 restore_from_C_call (SCHEME_A); 6280 restore_from_C_call (SCHEME_A);
5919 return SCHEME_V->value; 6281 return SCHEME_V->value;
5920} 6282}
5921 6283
5922pointer 6284ecb_cold pointer
5923scheme_eval (SCHEME_P_ pointer obj) 6285scheme_eval (SCHEME_P_ pointer obj)
5924{ 6286{
5925 int old_repl = SCHEME_V->interactive_repl; 6287 int old_repl = SCHEME_V->interactive_repl;
5926 6288
5927 SCHEME_V->interactive_repl = 0; 6289 SCHEME_V->interactive_repl = 0;
… …
5939 6301
5940/* ========== Main ========== */ 6302/* ========== Main ========== */
5941 6303
5942#if STANDALONE 6304#if STANDALONE
5943 6305
5944int 6306ecb_cold int
5945main (int argc, char **argv) 6307main (int argc, char **argv)
5946{ 6308{
5947# if USE_MULTIPLICITY 6309# if USE_MULTIPLICITY
5948 scheme ssc; 6310 scheme ssc;
5949 scheme *const SCHEME_V = &ssc; 6311 scheme *const SCHEME_V = &ssc;
… …
5951# endif 6313# endif
5952 int fin; 6314 int fin;
5953 char *file_name = InitFile; 6315 char *file_name = InitFile;
5954 int retcode; 6316 int retcode;
5955 int isfile = 1; 6317 int isfile = 1;
6318#if EXPERIMENT
6319 system ("ps v $PPID");
6320#endif
5956 6321
5957 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6322 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5958 { 6323 {
5959 xwrstr ("Usage: tinyscheme -?\n"); 6324 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5960 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6325 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5961 xwrstr ("followed by\n"); 6326 putstr (SCHEME_A_ "followed by\n");
5962 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6327 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5963 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6328 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5964 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6329 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5965 xwrstr ("Use - as filename for stdin.\n"); 6330 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5966 return 1; 6331 return 1;
5967 } 6332 }
5968 6333
5969 if (!scheme_init (SCHEME_A)) 6334 if (!scheme_init (SCHEME_A))
5970 { 6335 {
5971 xwrstr ("Could not initialize!\n"); 6336 putstr (SCHEME_A_ "Could not initialize!\n");
5972 return 2; 6337 return 2;
5973 } 6338 }
5974 6339
5975# if USE_PORTS 6340# if USE_PORTS
5976 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6341 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
5989 } 6354 }
5990#endif 6355#endif
5991 6356
5992 do 6357 do
5993 { 6358 {
5994#if USE_PORTS
5995 if (strcmp (file_name, "-") == 0) 6359 if (strcmp (file_name, "-") == 0)
5996 fin = STDIN_FILENO; 6360 fin = STDIN_FILENO;
5997 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6361 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
5998 { 6362 {
5999 pointer args = NIL; 6363 pointer args = NIL;
… …
6017 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6381 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
6018 6382
6019 } 6383 }
6020 else 6384 else
6021 fin = open (file_name, O_RDONLY); 6385 fin = open (file_name, O_RDONLY);
6022#endif
6023 6386
6024 if (isfile && fin < 0) 6387 if (isfile && fin < 0)
6025 { 6388 {
6026 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6389 putstr (SCHEME_A_ "Could not open file ");
6390 putstr (SCHEME_A_ file_name);
6391 putcharacter (SCHEME_A_ '\n');
6027 } 6392 }
6028 else 6393 else
6029 { 6394 {
6030 if (isfile) 6395 if (isfile)
6031 scheme_load_named_file (SCHEME_A_ fin, file_name); 6396 scheme_load_named_file (SCHEME_A_ fin, file_name);
6032 else 6397 else
6033 scheme_load_string (SCHEME_A_ file_name); 6398 scheme_load_string (SCHEME_A_ file_name);
6034 6399
6035#if USE_PORTS
6036 if (!isfile || fin != STDIN_FILENO) 6400 if (!isfile || fin != STDIN_FILENO)
6037 { 6401 {
6038 if (SCHEME_V->retcode != 0) 6402 if (SCHEME_V->retcode != 0)
6039 { 6403 {
6040 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6404 putstr (SCHEME_A_ "Errors encountered reading ");
6405 putstr (SCHEME_A_ file_name);
6406 putcharacter (SCHEME_A_ '\n');
6041 } 6407 }
6042 6408
6043 if (isfile) 6409 if (isfile)
6044 close (fin); 6410 close (fin);
6045 } 6411 }
6046#endif
6047 } 6412 }
6048 6413
6049 file_name = *argv++; 6414 file_name = *argv++;
6050 } 6415 }
6051 while (file_name != 0); 6416 while (file_name != 0);

Diff Legend

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