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

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.37 by root, Sun Nov 29 05:09:24 2015 UTC vs.
Revision 1.66 by root, Mon Dec 7 18:10:57 2015 UTC

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

Diff Legend

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