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.35 by root, Sun Nov 29 00:02:21 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);
… …
1354 1361
1355 for (i = start; i < veclength (vec); i++) 1362 for (i = start; i < veclength (vec); i++)
1356 vecvalue (vec)[i] = obj; 1363 vecvalue (vec)[i] = obj;
1357} 1364}
1358 1365
1366INTERFACE void
1367vector_resize (pointer vec, uint32_t newsize, pointer fill)
1368{
1369 uint32_t oldsize = veclength (vec);
1370 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1371 veclength (vec) = newsize;
1372 fill_vector (vec, oldsize, fill);
1373}
1374
1359INTERFACE pointer 1375INTERFACE pointer
1360vector_get (pointer vec, uint32_t ielem) 1376vector_get (pointer vec, uint32_t ielem)
1361{ 1377{
1362 return vecvalue(vec)[ielem]; 1378 return vecvalue(vec)[ielem];
1363} 1379}
… …
1379 x = oblist_add_by_name (SCHEME_A_ name); 1395 x = oblist_add_by_name (SCHEME_A_ name);
1380 1396
1381 return x; 1397 return x;
1382} 1398}
1383 1399
1384INTERFACE pointer 1400ecb_cold INTERFACE pointer
1385gensym (SCHEME_P) 1401gensym (SCHEME_P)
1386{ 1402{
1387 pointer x; 1403 pointer x;
1388 char name[40] = "gensym-"; 1404 char name[40] = "gensym-";
1389 xnum (name + 7, SCHEME_V->gensym_cnt); 1405 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1390 1406
1391 return generate_symbol (SCHEME_A_ name); 1407 return generate_symbol (SCHEME_A_ name);
1392} 1408}
1393 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
1394/* make symbol or number atom from string */ 1416/* make symbol or number atom from string */
1395static pointer 1417ecb_cold static pointer
1396mk_atom (SCHEME_P_ char *q) 1418mk_atom (SCHEME_P_ char *q)
1397{ 1419{
1398 char c, *p; 1420 char c, *p;
1399 int has_dec_point = 0; 1421 int has_dec_point = 0;
1400 int has_fp_exp = 0; 1422 int has_fp_exp = 0;
… …
1471 1493
1472 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1494 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1473} 1495}
1474 1496
1475/* make constant */ 1497/* make constant */
1476static pointer 1498ecb_cold static pointer
1477mk_sharp_const (SCHEME_P_ char *name) 1499mk_sharp_const (SCHEME_P_ char *name)
1478{ 1500{
1479 if (!strcmp (name, "t")) 1501 if (!strcmp (name, "t"))
1480 return S_T; 1502 return S_T;
1481 else if (!strcmp (name, "f")) 1503 else if (!strcmp (name, "f"))
1482 return S_F; 1504 return S_F;
1483 else if (*name == '\\') /* #\w (character) */ 1505 else if (*name == '\\') /* #\w (character) */
1484 { 1506 {
1485 int c; 1507 int c;
1486 1508
1509 // TODO: optimise
1487 if (stricmp (name + 1, "space") == 0) 1510 if (stricmp (name + 1, "space") == 0)
1488 c = ' '; 1511 c = ' ';
1489 else if (stricmp (name + 1, "newline") == 0) 1512 else if (stricmp (name + 1, "newline") == 0)
1490 c = '\n'; 1513 c = '\n';
1491 else if (stricmp (name + 1, "return") == 0) 1514 else if (stricmp (name + 1, "return") == 0)
1492 c = '\r'; 1515 c = '\r';
1493 else if (stricmp (name + 1, "tab") == 0) 1516 else if (stricmp (name + 1, "tab") == 0)
1494 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;
1495 else if (name[1] == 'x' && name[2] != 0) 1528 else if (name[1] == 'x' && name[2] != 0)
1496 { 1529 {
1497 long c1 = strtol (name + 2, 0, 16); 1530 long c1 = strtol (name + 2, 0, 16);
1498 1531
1499 if (0 <= c1 && c1 <= UCHAR_MAX) 1532 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1524 return NIL; 1557 return NIL;
1525 } 1558 }
1526} 1559}
1527 1560
1528/* ========== 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}
1529 1581
1530/*-- 1582/*--
1531 * 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,
1532 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1584 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1533 * for marking. 1585 * for marking.
1534 * 1586 *
1535 * The exception is vectors - vectors are currently marked recursively, 1587 * The exception is vectors - vectors are currently marked recursively,
1536 * 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
1537 * word of context in the vector 1589 * word of context in the vector
1538 */ 1590 */
1539static void 1591ecb_hot static void
1540mark (pointer a) 1592mark (pointer a)
1541{ 1593{
1542 pointer t, q, p; 1594 pointer t, q, p;
1543 1595
1544 t = 0; 1596 t = 0;
… …
1601 p = q; 1653 p = q;
1602 goto E6; 1654 goto E6;
1603 } 1655 }
1604} 1656}
1605 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
1606/* garbage collection. parameter a, b is marked. */ 1700/* garbage collection. parameter a, b is marked. */
1607static void 1701ecb_cold static void
1608gc (SCHEME_P_ pointer a, pointer b) 1702gc (SCHEME_P_ pointer a, pointer b)
1609{ 1703{
1610 pointer p;
1611 int i; 1704 int i;
1612 1705
1613 if (SCHEME_V->gc_verbose) 1706 if (SCHEME_V->gc_verbose)
1614 putstr (SCHEME_A_ "gc..."); 1707 putstr (SCHEME_A_ "gc...");
1615 1708
… …
1631 /* Mark recent objects the interpreter doesn't know about yet. */ 1724 /* Mark recent objects the interpreter doesn't know about yet. */
1632 mark (car (S_SINK)); 1725 mark (car (S_SINK));
1633 /* Mark any older stuff above nested C calls */ 1726 /* Mark any older stuff above nested C calls */
1634 mark (SCHEME_V->c_nest); 1727 mark (SCHEME_V->c_nest);
1635 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
1636 /* mark variables a, b */ 1736 /* mark variables a, b */
1637 mark (a); 1737 mark (a);
1638 mark (b); 1738 mark (b);
1639 1739
1640 /* garbage collect */ 1740 /* garbage collect */
1641 clrmark (NIL); 1741 clrmark (NIL);
1642 SCHEME_V->fcells = 0; 1742 SCHEME_V->fcells = 0;
1643 SCHEME_V->free_cell = NIL; 1743 SCHEME_V->free_cell = NIL;
1644 1744
1645 /* free-list is kept sorted by address so as to maintain consecutive
1646 ranges, if possible, for use with vectors. Here we scan the cells
1647 (which are also kept sorted by address) downwards to build the
1648 free-list in sorted order.
1649 */
1650 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1651 {
1652 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1653
1654 while (--p >= SCHEME_V->cell_seg[i])
1655 {
1656 if (is_mark (p))
1657 clrmark (p);
1658 else
1659 {
1660 /* reclaim cell */
1661 if (typeflag (p) != T_PAIR)
1662 {
1663 finalize_cell (SCHEME_A_ p);
1664 set_typeflag (p, T_PAIR);
1665 set_car (p, NIL);
1666 }
1667
1668 ++SCHEME_V->fcells;
1669 set_cdr (p, SCHEME_V->free_cell);
1670 SCHEME_V->free_cell = p;
1671 }
1672 }
1673 }
1674
1675 if (SCHEME_V->gc_verbose) 1745 if (SCHEME_V->gc_verbose)
1676 { 1746 putstr (SCHEME_A_ "freeing...");
1677 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1678 }
1679}
1680 1747
1681static void 1748 gc_free (SCHEME_A);
1682finalize_cell (SCHEME_P_ pointer a)
1683{
1684 /* TODO, fast bitmap check? */
1685 if (is_string (a))
1686 free (strvalue (a));
1687 else if (is_vector (a))
1688 free (vecvalue (a));
1689#if USE_PORTS
1690 else if (is_port (a))
1691 {
1692 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1693 port_close (SCHEME_A_ a, port_input | port_output);
1694
1695 free (a->object.port);
1696 }
1697#endif
1698} 1749}
1699 1750
1700/* ========== Routines for Reading ========== */ 1751/* ========== Routines for Reading ========== */
1701 1752
1702static int 1753ecb_cold static int
1703file_push (SCHEME_P_ const char *fname) 1754file_push (SCHEME_P_ const char *fname)
1704{ 1755{
1705#if USE_PORTS
1706 int fin; 1756 int fin;
1707 1757
1708 if (SCHEME_V->file_i == MAXFIL - 1) 1758 if (SCHEME_V->file_i == MAXFIL - 1)
1709 return 0; 1759 return 0;
1710 1760
… …
1716 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1766 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1717 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;
1718 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;
1719 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;
1720 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1770 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1721 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);
1722 1772
1723#if SHOW_ERROR_LINE 1773#if SHOW_ERROR_LINE
1724 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;
1725 1775
1726 if (fname) 1776 if (fname)
1727 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);
1728#endif 1778#endif
1729 } 1779 }
1730 1780
1731 return fin >= 0; 1781 return fin >= 0;
1732
1733#else
1734 return 1;
1735#endif
1736} 1782}
1737 1783
1738static void 1784ecb_cold static void
1739file_pop (SCHEME_P) 1785file_pop (SCHEME_P)
1740{ 1786{
1741 if (SCHEME_V->file_i != 0) 1787 if (SCHEME_V->file_i != 0)
1742 { 1788 {
1743 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1789 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1744#if USE_PORTS 1790#if USE_PORTS
1745 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1791 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1746#endif 1792#endif
1747 SCHEME_V->file_i--; 1793 SCHEME_V->file_i--;
1748 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);
1749 } 1795 }
1750} 1796}
1751 1797
1752static int 1798ecb_cold static int
1753file_interactive (SCHEME_P) 1799file_interactive (SCHEME_P)
1754{ 1800{
1755#if USE_PORTS 1801#if USE_PORTS
1756 return SCHEME_V->file_i == 0 1802 return SCHEME_V->file_i == 0
1757 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1803 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1758 && (SCHEME_V->inport->object.port->kind & port_file); 1804 && (port (SCHEME_V->inport)->kind & port_file);
1759#else 1805#else
1760 return 0; 1806 return 0;
1761#endif 1807#endif
1762} 1808}
1763 1809
1764#if USE_PORTS 1810#if USE_PORTS
1765static port * 1811ecb_cold static port *
1766port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1812port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1767{ 1813{
1768 int fd; 1814 int fd;
1769 int flags; 1815 int flags;
1770 char *rw; 1816 char *rw;
… …
1793# endif 1839# endif
1794 1840
1795 return pt; 1841 return pt;
1796} 1842}
1797 1843
1798static pointer 1844ecb_cold static pointer
1799port_from_filename (SCHEME_P_ const char *fn, int prop) 1845port_from_filename (SCHEME_P_ const char *fn, int prop)
1800{ 1846{
1801 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1847 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1802 1848
1803 if (!pt && USE_ERROR_CHECKING) 1849 if (!pt && USE_ERROR_CHECKING)
1804 return NIL; 1850 return NIL;
1805 1851
1806 return mk_port (SCHEME_A_ pt); 1852 return mk_port (SCHEME_A_ pt);
1807} 1853}
1808 1854
1809static port * 1855ecb_cold static port *
1810port_rep_from_file (SCHEME_P_ int f, int prop) 1856port_rep_from_file (SCHEME_P_ int f, int prop)
1811{ 1857{
1812 port *pt = malloc (sizeof *pt); 1858 port *pt = malloc (sizeof *pt);
1813 1859
1814 if (!pt && USE_ERROR_CHECKING) 1860 if (!pt && USE_ERROR_CHECKING)
… …
1819 pt->rep.stdio.file = f; 1865 pt->rep.stdio.file = f;
1820 pt->rep.stdio.closeit = 0; 1866 pt->rep.stdio.closeit = 0;
1821 return pt; 1867 return pt;
1822} 1868}
1823 1869
1824static pointer 1870ecb_cold static pointer
1825port_from_file (SCHEME_P_ int f, int prop) 1871port_from_file (SCHEME_P_ int f, int prop)
1826{ 1872{
1827 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1873 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1828 1874
1829 if (!pt && USE_ERROR_CHECKING) 1875 if (!pt && USE_ERROR_CHECKING)
1830 return NIL; 1876 return NIL;
1831 1877
1832 return mk_port (SCHEME_A_ pt); 1878 return mk_port (SCHEME_A_ pt);
1833} 1879}
1834 1880
1835static port * 1881ecb_cold static port *
1836port_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)
1837{ 1883{
1838 port *pt = malloc (sizeof (port)); 1884 port *pt = malloc (sizeof (port));
1839 1885
1840 if (!pt && USE_ERROR_CHECKING) 1886 if (!pt && USE_ERROR_CHECKING)
… …
1846 pt->rep.string.curr = start; 1892 pt->rep.string.curr = start;
1847 pt->rep.string.past_the_end = past_the_end; 1893 pt->rep.string.past_the_end = past_the_end;
1848 return pt; 1894 return pt;
1849} 1895}
1850 1896
1851static pointer 1897ecb_cold static pointer
1852port_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)
1853{ 1899{
1854 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);
1855 1901
1856 if (!pt && USE_ERROR_CHECKING) 1902 if (!pt && USE_ERROR_CHECKING)
… …
1859 return mk_port (SCHEME_A_ pt); 1905 return mk_port (SCHEME_A_ pt);
1860} 1906}
1861 1907
1862# define BLOCK_SIZE 256 1908# define BLOCK_SIZE 256
1863 1909
1864static port * 1910ecb_cold static port *
1865port_rep_from_scratch (SCHEME_P) 1911port_rep_from_scratch (SCHEME_P)
1866{ 1912{
1867 char *start; 1913 char *start;
1868 port *pt = malloc (sizeof (port)); 1914 port *pt = malloc (sizeof (port));
1869 1915
… …
1883 pt->rep.string.curr = start; 1929 pt->rep.string.curr = start;
1884 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1930 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1885 return pt; 1931 return pt;
1886} 1932}
1887 1933
1888static pointer 1934ecb_cold static pointer
1889port_from_scratch (SCHEME_P) 1935port_from_scratch (SCHEME_P)
1890{ 1936{
1891 port *pt = port_rep_from_scratch (SCHEME_A); 1937 port *pt = port_rep_from_scratch (SCHEME_A);
1892 1938
1893 if (!pt && USE_ERROR_CHECKING) 1939 if (!pt && USE_ERROR_CHECKING)
1894 return NIL; 1940 return NIL;
1895 1941
1896 return mk_port (SCHEME_A_ pt); 1942 return mk_port (SCHEME_A_ pt);
1897} 1943}
1898 1944
1899static void 1945ecb_cold static void
1900port_close (SCHEME_P_ pointer p, int flag) 1946port_close (SCHEME_P_ pointer p, int flag)
1901{ 1947{
1902 port *pt = p->object.port; 1948 port *pt = port (p);
1903 1949
1904 pt->kind &= ~flag; 1950 pt->kind &= ~flag;
1905 1951
1906 if ((pt->kind & (port_input | port_output)) == 0) 1952 if ((pt->kind & (port_input | port_output)) == 0)
1907 { 1953 {
… …
1924 } 1970 }
1925} 1971}
1926#endif 1972#endif
1927 1973
1928/* get new character from input file */ 1974/* get new character from input file */
1929static int 1975ecb_cold static int
1930inchar (SCHEME_P) 1976inchar (SCHEME_P)
1931{ 1977{
1932 int c; 1978 int c;
1933 port *pt; 1979 port *pt = port (SCHEME_V->inport);
1934
1935 pt = SCHEME_V->inport->object.port;
1936 1980
1937 if (pt->kind & port_saw_EOF) 1981 if (pt->kind & port_saw_EOF)
1938 return EOF; 1982 return EOF;
1939 1983
1940 c = basic_inchar (pt); 1984 c = basic_inchar (pt);
… …
1950 } 1994 }
1951 1995
1952 return c; 1996 return c;
1953} 1997}
1954 1998
1955static int ungot = -1; 1999ecb_cold static int
1956
1957static int
1958basic_inchar (port *pt) 2000basic_inchar (port *pt)
1959{ 2001{
1960#if USE_PORTS
1961 if (pt->unget != -1) 2002 if (pt->unget != -1)
1962 { 2003 {
1963 int r = pt->unget; 2004 int r = pt->unget;
1964 pt->unget = -1; 2005 pt->unget = -1;
1965 return r; 2006 return r;
1966 } 2007 }
1967 2008
2009#if USE_PORTS
1968 if (pt->kind & port_file) 2010 if (pt->kind & port_file)
1969 { 2011 {
1970 char c; 2012 char c;
1971 2013
1972 if (!read (pt->rep.stdio.file, &c, 1)) 2014 if (!read (pt->rep.stdio.file, &c, 1))
… …
1980 return EOF; 2022 return EOF;
1981 else 2023 else
1982 return *pt->rep.string.curr++; 2024 return *pt->rep.string.curr++;
1983 } 2025 }
1984#else 2026#else
1985 if (ungot == -1)
1986 {
1987 char c; 2027 char c;
1988 if (!read (0, &c, 1)) 2028
2029 if (!read (pt->rep.stdio.file, &c, 1))
1989 return EOF; 2030 return EOF;
1990 2031
1991 ungot = c;
1992 }
1993
1994 {
1995 int r = ungot;
1996 ungot = -1;
1997 return r; 2032 return c;
1998 }
1999#endif 2033#endif
2000} 2034}
2001 2035
2002/* back character to input buffer */ 2036/* back character to input buffer */
2003static void 2037ecb_cold static void
2004backchar (SCHEME_P_ int c) 2038backchar (SCHEME_P_ int c)
2005{ 2039{
2006#if USE_PORTS 2040 port *pt = port (SCHEME_V->inport);
2007 port *pt;
2008 2041
2009 if (c == EOF) 2042 if (c == EOF)
2010 return; 2043 return;
2011 2044
2012 pt = SCHEME_V->inport->object.port;
2013 pt->unget = c; 2045 pt->unget = c;
2014#else
2015 if (c == EOF)
2016 return;
2017
2018 ungot = c;
2019#endif
2020} 2046}
2021 2047
2022#if USE_PORTS 2048#if USE_PORTS
2023static int 2049ecb_cold static int
2024realloc_port_string (SCHEME_P_ port *p) 2050realloc_port_string (SCHEME_P_ port *p)
2025{ 2051{
2026 char *start = p->rep.string.start; 2052 char *start = p->rep.string.start;
2027 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;
2028 char *str = malloc (new_size); 2054 char *str = malloc (new_size);
… …
2041 else 2067 else
2042 return 0; 2068 return 0;
2043} 2069}
2044#endif 2070#endif
2045 2071
2046INTERFACE void 2072ecb_cold static void
2047putstr (SCHEME_P_ const char *s) 2073putchars (SCHEME_P_ const char *s, int len)
2048{ 2074{
2075 port *pt = port (SCHEME_V->outport);
2076
2049#if USE_PORTS 2077#if USE_PORTS
2050 port *pt = SCHEME_V->outport->object.port;
2051
2052 if (pt->kind & port_file)
2053 write (pt->rep.stdio.file, s, strlen (s));
2054 else
2055 for (; *s; s++)
2056 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2057 *pt->rep.string.curr++ = *s;
2058 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2059 *pt->rep.string.curr++ = *s;
2060
2061#else
2062 xwrstr (s);
2063#endif
2064}
2065
2066static void
2067putchars (SCHEME_P_ const char *s, int len)
2068{
2069#if USE_PORTS
2070 port *pt = SCHEME_V->outport->object.port;
2071
2072 if (pt->kind & port_file) 2078 if (pt->kind & port_file)
2073 write (pt->rep.stdio.file, s, len); 2079 write (pt->rep.stdio.file, s, len);
2074 else 2080 else
2075 { 2081 {
2076 for (; len; len--) 2082 for (; len; len--)
… …
2081 *pt->rep.string.curr++ = *s++; 2087 *pt->rep.string.curr++ = *s++;
2082 } 2088 }
2083 } 2089 }
2084 2090
2085#else 2091#else
2086 write (1, s, len); 2092 write (1, s, len); // output not initialised
2087#endif 2093#endif
2094}
2095
2096INTERFACE void
2097putstr (SCHEME_P_ const char *s)
2098{
2099 putchars (SCHEME_A_ s, strlen (s));
2088} 2100}
2089 2101
2090INTERFACE void 2102INTERFACE void
2091putcharacter (SCHEME_P_ int c) 2103putcharacter (SCHEME_P_ int c)
2092{ 2104{
2093#if USE_PORTS
2094 port *pt = SCHEME_V->outport->object.port;
2095
2096 if (pt->kind & port_file)
2097 {
2098 char cc = c;
2099 write (pt->rep.stdio.file, &cc, 1);
2100 }
2101 else
2102 {
2103 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2104 *pt->rep.string.curr++ = c;
2105 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2106 *pt->rep.string.curr++ = c;
2107 }
2108
2109#else
2110 char cc = c; 2105 char cc = c;
2111 write (1, &c, 1); 2106
2112#endif 2107 putchars (SCHEME_A_ &cc, 1);
2113} 2108}
2114 2109
2115/* read characters up to delimiter, but cater to character constants */ 2110/* read characters up to delimiter, but cater to character constants */
2116static char * 2111ecb_cold static char *
2117readstr_upto (SCHEME_P_ int skip, const char *delim) 2112readstr_upto (SCHEME_P_ int skip, const char *delim)
2118{ 2113{
2119 char *p = SCHEME_V->strbuff + skip; 2114 char *p = SCHEME_V->strbuff + skip;
2120 2115
2121 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))));
… …
2130 2125
2131 return SCHEME_V->strbuff; 2126 return SCHEME_V->strbuff;
2132} 2127}
2133 2128
2134/* read string expression "xxx...xxx" */ 2129/* read string expression "xxx...xxx" */
2135static pointer 2130ecb_cold static pointer
2136readstrexp (SCHEME_P_ char delim) 2131readstrexp (SCHEME_P_ char delim)
2137{ 2132{
2138 char *p = SCHEME_V->strbuff; 2133 char *p = SCHEME_V->strbuff;
2139 int c; 2134 int c;
2140 int c1 = 0; 2135 int c1 = 0;
… …
2173 case '7': 2168 case '7':
2174 state = st_oct1; 2169 state = st_oct1;
2175 c1 = c - '0'; 2170 c1 = c - '0';
2176 break; 2171 break;
2177 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
2178 case 'x': 2188 case 'x':
2179 case 'X': 2189 case 'X':
2180 state = st_x1; 2190 state = st_x1;
2181 c1 = 0; 2191 c1 = 0;
2182 break;
2183
2184 case 'n':
2185 *p++ = '\n';
2186 state = st_ok;
2187 break;
2188
2189 case 't':
2190 *p++ = '\t';
2191 state = st_ok;
2192 break;
2193
2194 case 'r':
2195 *p++ = '\r';
2196 state = st_ok;
2197 break; 2192 break;
2198 2193
2199 default: 2194 default:
2200 *p++ = c; 2195 *p++ = c;
2201 state = st_ok; 2196 state = st_ok;
… …
2253 } 2248 }
2254 } 2249 }
2255} 2250}
2256 2251
2257/* check c is in chars */ 2252/* check c is in chars */
2258ecb_inline int 2253ecb_cold int
2259is_one_of (const char *s, int c) 2254is_one_of (const char *s, int c)
2260{ 2255{
2261 if (c == EOF)
2262 return 1;
2263
2264 return !!strchr (s, c); 2256 return c == EOF || !!strchr (s, c);
2265} 2257}
2266 2258
2267/* skip white characters */ 2259/* skip white characters */
2268ecb_inline int 2260ecb_cold int
2269skipspace (SCHEME_P) 2261skipspace (SCHEME_P)
2270{ 2262{
2271 int c, curr_line = 0; 2263 int c, curr_line = 0;
2272 2264
2273 do 2265 do
2274 { 2266 {
2275 c = inchar (SCHEME_A); 2267 c = inchar (SCHEME_A);
2268
2276#if SHOW_ERROR_LINE 2269#if SHOW_ERROR_LINE
2277 if (c == '\n') 2270 if (ecb_expect_false (c == '\n'))
2278 curr_line++; 2271 curr_line++;
2279#endif 2272#endif
2273
2274 if (ecb_expect_false (c == EOF))
2275 return c;
2280 } 2276 }
2281 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2277 while (is_one_of (WHITESPACE, c));
2282 2278
2283 /* record it */ 2279 /* record it */
2284#if SHOW_ERROR_LINE 2280#if SHOW_ERROR_LINE
2285 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)
2286 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;
2287#endif 2283#endif
2288 2284
2289 if (c != EOF)
2290 {
2291 backchar (SCHEME_A_ c); 2285 backchar (SCHEME_A_ c);
2292 return 1; 2286 return 1;
2293 }
2294 else
2295 return EOF;
2296} 2287}
2297 2288
2298/* get token */ 2289/* get token */
2299static int 2290ecb_cold static int
2300token (SCHEME_P) 2291token (SCHEME_P)
2301{ 2292{
2302 int c = skipspace (SCHEME_A); 2293 int c = skipspace (SCHEME_A);
2303 2294
2304 if (c == EOF) 2295 if (c == EOF)
… …
2316 return TOK_RPAREN; 2307 return TOK_RPAREN;
2317 2308
2318 case '.': 2309 case '.':
2319 c = inchar (SCHEME_A); 2310 c = inchar (SCHEME_A);
2320 2311
2321 if (is_one_of (" \n\t", c)) 2312 if (is_one_of (WHITESPACE, c))
2322 return TOK_DOT; 2313 return TOK_DOT;
2323 else 2314 else
2324 { 2315 {
2325 backchar (SCHEME_A_ c); 2316 backchar (SCHEME_A_ c);
2326 return TOK_DOTATOM; 2317 return TOK_DOTATOM;
… …
2402} 2393}
2403 2394
2404/* ========== Routines for Printing ========== */ 2395/* ========== Routines for Printing ========== */
2405#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2396#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2406 2397
2407static void 2398ecb_cold static void
2408printslashstring (SCHEME_P_ char *p, int len) 2399printslashstring (SCHEME_P_ char *p, int len)
2409{ 2400{
2410 int i; 2401 int i;
2411 unsigned char *s = (unsigned char *) p; 2402 unsigned char *s = (unsigned char *) p;
2412 2403
… …
2467 } 2458 }
2468 2459
2469 putcharacter (SCHEME_A_ '"'); 2460 putcharacter (SCHEME_A_ '"');
2470} 2461}
2471 2462
2472
2473/* print atoms */ 2463/* print atoms */
2474static void 2464ecb_cold static void
2475printatom (SCHEME_P_ pointer l, int f) 2465printatom (SCHEME_P_ pointer l, int f)
2476{ 2466{
2477 char *p; 2467 char *p;
2478 int len; 2468 int len;
2479 2469
2480 atom2str (SCHEME_A_ l, f, &p, &len); 2470 atom2str (SCHEME_A_ l, f, &p, &len);
2481 putchars (SCHEME_A_ p, len); 2471 putchars (SCHEME_A_ p, len);
2482} 2472}
2483 2473
2484
2485/* Uses internal buffer unless string pointer is already available */ 2474/* Uses internal buffer unless string pointer is already available */
2486static void 2475ecb_cold static void
2487atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2476atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2488{ 2477{
2489 char *p; 2478 char *p;
2490 2479
2491 if (l == NIL) 2480 if (l == NIL)
… …
2649#endif 2638#endif
2650 } 2639 }
2651 else if (is_continuation (l)) 2640 else if (is_continuation (l))
2652 p = "#<CONTINUATION>"; 2641 p = "#<CONTINUATION>";
2653 else 2642 else
2643 {
2644#if USE_PRINTF
2645 p = SCHEME_V->strbuff;
2646 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2647#else
2654 p = "#<ERROR>"; 2648 p = "#<ERROR>";
2649#endif
2650 }
2655 2651
2656 *pp = p; 2652 *pp = p;
2657 *plen = strlen (p); 2653 *plen = strlen (p);
2658} 2654}
2659 2655
… …
2691 return car (d); 2687 return car (d);
2692 2688
2693 p = cons (car (d), cdr (d)); 2689 p = cons (car (d), cdr (d));
2694 q = p; 2690 q = p;
2695 2691
2696 while (cdr (cdr (p)) != NIL) 2692 while (cddr (p) != NIL)
2697 { 2693 {
2698 d = cons (car (p), cdr (p)); 2694 d = cons (car (p), cdr (p));
2699 2695
2700 if (cdr (cdr (p)) != NIL) 2696 if (cddr (p) != NIL)
2701 p = cdr (d); 2697 p = cdr (d);
2702 } 2698 }
2703 2699
2704 set_cdr (p, car (cdr (p))); 2700 set_cdr (p, cadr (p));
2705 return q; 2701 return q;
2706} 2702}
2707 2703
2708/* reverse list -- produce new list */ 2704/* reverse list -- produce new list */
2709static pointer 2705ecb_hot static pointer
2710reverse (SCHEME_P_ pointer a) 2706reverse (SCHEME_P_ pointer a)
2711{ 2707{
2712 /* a must be checked by gc */ 2708 /* a must be checked by gc */
2713 pointer p = NIL; 2709 pointer p = NIL;
2714 2710
… …
2717 2713
2718 return p; 2714 return p;
2719} 2715}
2720 2716
2721/* reverse list --- in-place */ 2717/* reverse list --- in-place */
2722static pointer 2718ecb_hot static pointer
2723reverse_in_place (SCHEME_P_ pointer term, pointer list) 2719reverse_in_place (SCHEME_P_ pointer term, pointer list)
2724{ 2720{
2725 pointer result = term; 2721 pointer result = term;
2726 pointer p = list; 2722 pointer p = list;
2727 2723
… …
2735 2731
2736 return result; 2732 return result;
2737} 2733}
2738 2734
2739/* append list -- produce new list (in reverse order) */ 2735/* append list -- produce new list (in reverse order) */
2740static pointer 2736ecb_hot static pointer
2741revappend (SCHEME_P_ pointer a, pointer b) 2737revappend (SCHEME_P_ pointer a, pointer b)
2742{ 2738{
2743 pointer result = a; 2739 pointer result = a;
2744 pointer p = b; 2740 pointer p = b;
2745 2741
… …
2754 2750
2755 return S_F; /* signal an error */ 2751 return S_F; /* signal an error */
2756} 2752}
2757 2753
2758/* equivalence of atoms */ 2754/* equivalence of atoms */
2759int 2755ecb_hot int
2760eqv (pointer a, pointer b) 2756eqv (pointer a, pointer b)
2761{ 2757{
2762 if (is_string (a)) 2758 if (is_string (a))
2763 { 2759 {
2764 if (is_string (b)) 2760 if (is_string (b))
… …
2858 } 2854 }
2859 else 2855 else
2860 set_car (env, immutable_cons (slot, car (env))); 2856 set_car (env, immutable_cons (slot, car (env)));
2861} 2857}
2862 2858
2863static pointer 2859ecb_hot static pointer
2864find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2860find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2865{ 2861{
2866 pointer x, y; 2862 pointer x, y;
2867 2863
2868 for (x = env; x != NIL; x = cdr (x)) 2864 for (x = env; x != NIL; x = cdr (x))
… …
2889 return NIL; 2885 return NIL;
2890} 2886}
2891 2887
2892#else /* USE_ALIST_ENV */ 2888#else /* USE_ALIST_ENV */
2893 2889
2894ecb_inline void 2890static void
2895new_frame_in_env (SCHEME_P_ pointer old_env) 2891new_frame_in_env (SCHEME_P_ pointer old_env)
2896{ 2892{
2897 SCHEME_V->envir = immutable_cons (NIL, old_env); 2893 SCHEME_V->envir = immutable_cons (NIL, old_env);
2898 setenvironment (SCHEME_V->envir); 2894 setenvironment (SCHEME_V->envir);
2899} 2895}
2900 2896
2901ecb_inline void 2897static void
2902new_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)
2903{ 2899{
2904 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2900 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2905} 2901}
2906 2902
2907static pointer 2903ecb_hot static pointer
2908find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2904find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2909{ 2905{
2910 pointer x, y; 2906 pointer x, y;
2911 2907
2912 for (x = env; x != NIL; x = cdr (x)) 2908 for (x = env; x != NIL; x = cdr (x))
… …
2926 return NIL; 2922 return NIL;
2927} 2923}
2928 2924
2929#endif /* USE_ALIST_ENV else */ 2925#endif /* USE_ALIST_ENV else */
2930 2926
2931ecb_inline void 2927static void
2932new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2928new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2933{ 2929{
2930 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2934 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);
2935} 2932}
2936 2933
2937ecb_inline void 2934static void
2938set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2935set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2939{ 2936{
2940 set_cdr (slot, value); 2937 set_cdr (slot, value);
2941} 2938}
2942 2939
2943ecb_inline pointer 2940static pointer
2944slot_value_in_env (pointer slot) 2941slot_value_in_env (pointer slot)
2945{ 2942{
2946 return cdr (slot); 2943 return cdr (slot);
2947} 2944}
2948 2945
2949/* ========== Evaluation Cycle ========== */ 2946/* ========== Evaluation Cycle ========== */
2950 2947
2951static int 2948ecb_cold static int
2952xError_1 (SCHEME_P_ const char *s, pointer a) 2949xError_1 (SCHEME_P_ const char *s, pointer a)
2953{ 2950{
2954#if USE_ERROR_HOOK
2955 pointer x;
2956 pointer hdl = SCHEME_V->ERROR_HOOK;
2957#endif
2958
2959#if USE_PRINTF 2951#if USE_PRINTF
2960#if SHOW_ERROR_LINE 2952#if SHOW_ERROR_LINE
2961 char sbuf[STRBUFFSIZE]; 2953 char sbuf[STRBUFFSIZE];
2962 2954
2963 /* make sure error is not in REPL */ 2955 /* make sure error is not in REPL */
… …
2978 } 2970 }
2979#endif 2971#endif
2980#endif 2972#endif
2981 2973
2982#if USE_ERROR_HOOK 2974#if USE_ERROR_HOOK
2983 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);
2984 2976
2985 if (x != NIL) 2977 if (x != NIL)
2986 { 2978 {
2987 pointer code = a 2979 pointer code = a
2988 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2980 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3032 pointer code; 3024 pointer code;
3033}; 3025};
3034 3026
3035# define STACK_GROWTH 3 3027# define STACK_GROWTH 3
3036 3028
3037static void 3029ecb_hot static void
3038s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3030s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3039{ 3031{
3040 int nframes = (uintptr_t)SCHEME_V->dump; 3032 int nframes = (uintptr_t)SCHEME_V->dump;
3041 struct dump_stack_frame *next_frame; 3033 struct dump_stack_frame *next_frame;
3042 3034
3043 /* enough room for the next frame? */ 3035 /* enough room for the next frame? */
3044 if (nframes >= SCHEME_V->dump_size) 3036 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3045 { 3037 {
3046 SCHEME_V->dump_size += STACK_GROWTH; 3038 SCHEME_V->dump_size += STACK_GROWTH;
3047 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);
3048 } 3040 }
3049 3041
… …
3055 next_frame->code = code; 3047 next_frame->code = code;
3056 3048
3057 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3049 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3058} 3050}
3059 3051
3060static int 3052static ecb_hot int
3061xs_return (SCHEME_P_ pointer a) 3053xs_return (SCHEME_P_ pointer a)
3062{ 3054{
3063 int nframes = (uintptr_t)SCHEME_V->dump; 3055 int nframes = (uintptr_t)SCHEME_V->dump;
3064 struct dump_stack_frame *frame; 3056 struct dump_stack_frame *frame;
3065 3057
… …
3076 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3068 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3077 3069
3078 return 0; 3070 return 0;
3079} 3071}
3080 3072
3081ecb_inline void 3073ecb_cold void
3082dump_stack_reset (SCHEME_P) 3074dump_stack_reset (SCHEME_P)
3083{ 3075{
3084 /* 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 */
3085 SCHEME_V->dump = (pointer)+0; 3077 SCHEME_V->dump = (pointer)+0;
3086} 3078}
3087 3079
3088ecb_inline void 3080ecb_cold void
3089dump_stack_initialize (SCHEME_P) 3081dump_stack_initialize (SCHEME_P)
3090{ 3082{
3091 SCHEME_V->dump_size = 0; 3083 SCHEME_V->dump_size = 0;
3092 SCHEME_V->dump_base = 0; 3084 SCHEME_V->dump_base = 0;
3093 dump_stack_reset (SCHEME_A); 3085 dump_stack_reset (SCHEME_A);
3094} 3086}
3095 3087
3096static void 3088ecb_cold static void
3097dump_stack_free (SCHEME_P) 3089dump_stack_free (SCHEME_P)
3098{ 3090{
3099 free (SCHEME_V->dump_base); 3091 free (SCHEME_V->dump_base);
3100 SCHEME_V->dump_base = 0; 3092 SCHEME_V->dump_base = 0;
3101 SCHEME_V->dump = (pointer)0; 3093 SCHEME_V->dump = (pointer)0;
3102 SCHEME_V->dump_size = 0; 3094 SCHEME_V->dump_size = 0;
3103} 3095}
3104 3096
3105static void 3097ecb_cold static void
3106dump_stack_mark (SCHEME_P) 3098dump_stack_mark (SCHEME_P)
3107{ 3099{
3108 int nframes = (uintptr_t)SCHEME_V->dump; 3100 int nframes = (uintptr_t)SCHEME_V->dump;
3109 int i; 3101 int i;
3110 3102
… …
3116 mark (frame->envir); 3108 mark (frame->envir);
3117 mark (frame->code); 3109 mark (frame->code);
3118 } 3110 }
3119} 3111}
3120 3112
3121static pointer 3113ecb_cold static pointer
3122ss_get_cont (SCHEME_P) 3114ss_get_cont (SCHEME_P)
3123{ 3115{
3124 int nframes = (uintptr_t)SCHEME_V->dump; 3116 int nframes = (uintptr_t)SCHEME_V->dump;
3125 int i; 3117 int i;
3126 3118
… …
3138 } 3130 }
3139 3131
3140 return cont; 3132 return cont;
3141} 3133}
3142 3134
3143static void 3135ecb_cold static void
3144ss_set_cont (SCHEME_P_ pointer cont) 3136ss_set_cont (SCHEME_P_ pointer cont)
3145{ 3137{
3146 int i = 0; 3138 int i = 0;
3147 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3139 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3148 3140
… …
3160 SCHEME_V->dump = (pointer)(uintptr_t)i; 3152 SCHEME_V->dump = (pointer)(uintptr_t)i;
3161} 3153}
3162 3154
3163#else 3155#else
3164 3156
3165ecb_inline void 3157ecb_cold void
3166dump_stack_reset (SCHEME_P) 3158dump_stack_reset (SCHEME_P)
3167{ 3159{
3168 SCHEME_V->dump = NIL; 3160 SCHEME_V->dump = NIL;
3169} 3161}
3170 3162
3171ecb_inline void 3163ecb_cold void
3172dump_stack_initialize (SCHEME_P) 3164dump_stack_initialize (SCHEME_P)
3173{ 3165{
3174 dump_stack_reset (SCHEME_A); 3166 dump_stack_reset (SCHEME_A);
3175} 3167}
3176 3168
3177static void 3169ecb_cold static void
3178dump_stack_free (SCHEME_P) 3170dump_stack_free (SCHEME_P)
3179{ 3171{
3180 SCHEME_V->dump = NIL; 3172 SCHEME_V->dump = NIL;
3181} 3173}
3182 3174
3183static int 3175ecb_hot static int
3184xs_return (SCHEME_P_ pointer a) 3176xs_return (SCHEME_P_ pointer a)
3185{ 3177{
3186 pointer dump = SCHEME_V->dump; 3178 pointer dump = SCHEME_V->dump;
3187 3179
3188 SCHEME_V->value = a; 3180 SCHEME_V->value = a;
… …
3198 SCHEME_V->dump = dump; 3190 SCHEME_V->dump = dump;
3199 3191
3200 return 0; 3192 return 0;
3201} 3193}
3202 3194
3203static void 3195ecb_hot static void
3204s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3196s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3205{ 3197{
3206 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3198 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3207 cons (args, 3199 cons (args,
3208 cons (SCHEME_V->envir, 3200 cons (SCHEME_V->envir,
3209 cons (code, 3201 cons (code,
3210 SCHEME_V->dump)))); 3202 SCHEME_V->dump))));
3211} 3203}
3212 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
3213static void 3417static void
3214dump_stack_mark (SCHEME_P) 3418compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3215{ 3419{
3216 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);
3217} 3496}
3218 3497
3219static pointer 3498static pointer
3220ss_get_cont (SCHEME_P) 3499lookup (SCHEME_P_ pointer x)
3221{ 3500{
3222 return SCHEME_V->dump; 3501 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, x, 1);
3223}
3224 3502
3225static void 3503 if (x != NIL)
3226ss_set_cont (SCHEME_P_ pointer cont) 3504 x = slot_value_in_env (x);
3227{
3228 SCHEME_V->dump = cont;
3229}
3230 3505
3231#endif 3506 return x;
3507}
3232 3508
3233#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 }
3234 3517
3235static 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
3236opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3712opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3237{ 3713{
3238 pointer args = SCHEME_V->args; 3714 pointer args = SCHEME_V->args;
3239 pointer x, y; 3715 pointer x, y;
3240 3716
3241 switch (op) 3717 switch (op)
3242 { 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
3243 case OP_LOAD: /* load */ 3732 case OP_LOAD: /* load */
3244 if (file_interactive (SCHEME_A)) 3733 if (file_interactive (SCHEME_A))
3245 { 3734 {
3246 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3735 putstr (SCHEME_A_ "Loading ");
3247 //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');
3248 } 3738 }
3249 3739
3250 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3740 if (!file_push (SCHEME_A_ strvalue (car (args))))
3251 Error_1 ("unable to open", car (args)); 3741 Error_1 ("unable to open", car (args));
3252 else 3742
3253 {
3254 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3743 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3255 s_goto (OP_T0LVL); 3744 s_goto (OP_T0LVL);
3256 }
3257 3745
3258 case OP_T0LVL: /* top level */ 3746 case OP_T0LVL: /* top level */
3259 3747
3260 /* If we reached the end of file, this loop is done. */ 3748 /* If we reached the end of file, this loop is done. */
3261 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3749 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3262 { 3750 {
3263 if (SCHEME_V->file_i == 0) 3751 if (SCHEME_V->file_i == 0)
3264 { 3752 {
3265 SCHEME_V->args = NIL; 3753 SCHEME_V->args = NIL;
3266 s_goto (OP_QUIT); 3754 s_goto (OP_QUIT);
… …
3277 /* If interactive, be nice to user. */ 3765 /* If interactive, be nice to user. */
3278 if (file_interactive (SCHEME_A)) 3766 if (file_interactive (SCHEME_A))
3279 { 3767 {
3280 SCHEME_V->envir = SCHEME_V->global_env; 3768 SCHEME_V->envir = SCHEME_V->global_env;
3281 dump_stack_reset (SCHEME_A); 3769 dump_stack_reset (SCHEME_A);
3282 putstr (SCHEME_A_ "\n"); 3770 putcharacter (SCHEME_A_ '\n');
3771#if EXPERIMENT
3772 system ("ps v $PPID");
3773#endif
3283 putstr (SCHEME_A_ prompt); 3774 putstr (SCHEME_A_ prompt);
3284 } 3775 }
3285 3776
3286 /* Set up another iteration of REPL */ 3777 /* Set up another iteration of REPL */
3287 SCHEME_V->nesting = 0; 3778 SCHEME_V->nesting = 0;
… …
3322 { 3813 {
3323 SCHEME_V->print_flag = 1; 3814 SCHEME_V->print_flag = 1;
3324 SCHEME_V->args = SCHEME_V->value; 3815 SCHEME_V->args = SCHEME_V->value;
3325 s_goto (OP_P0LIST); 3816 s_goto (OP_P0LIST);
3326 } 3817 }
3327 else 3818
3328 s_return (SCHEME_V->value); 3819 s_return (SCHEME_V->value);
3329 3820
3330 case OP_EVAL: /* main part of evaluation */ 3821 case OP_EVAL: /* main part of evaluation */
3331#if USE_TRACING 3822#if USE_TRACING
3332 if (SCHEME_V->tracing) 3823 if (SCHEME_V->tracing)
3333 { 3824 {
… …
3344#endif 3835#endif
3345 if (is_symbol (SCHEME_V->code)) /* symbol */ 3836 if (is_symbol (SCHEME_V->code)) /* symbol */
3346 { 3837 {
3347 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);
3348 3839
3349 if (x != NIL) 3840 if (x == NIL)
3350 s_return (slot_value_in_env (x));
3351 else
3352 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));
3353 } 3844 }
3354 else if (is_pair (SCHEME_V->code)) 3845 else if (is_pair (SCHEME_V->code))
3355 { 3846 {
3356 x = car (SCHEME_V->code); 3847 x = car (SCHEME_V->code);
3357 3848
… …
3366 /* 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)); */
3367 SCHEME_V->code = x; 3858 SCHEME_V->code = x;
3368 s_goto (OP_EVAL); 3859 s_goto (OP_EVAL);
3369 } 3860 }
3370 } 3861 }
3371 else 3862
3372 s_return (SCHEME_V->code); 3863 s_return (SCHEME_V->code);
3373 3864
3374 case OP_E0ARGS: /* eval arguments */ 3865 case OP_E0ARGS: /* eval arguments */
3375 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3866 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3376 { 3867 {
3377 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3868 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3378 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3869 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3379 SCHEME_V->code = SCHEME_V->value; 3870 SCHEME_V->code = SCHEME_V->value;
3380 s_goto (OP_APPLY); 3871 s_goto (OP_APPLY);
3381 } 3872 }
3382 else 3873
3383 {
3384 SCHEME_V->code = cdr (SCHEME_V->code); 3874 SCHEME_V->code = cdr (SCHEME_V->code);
3385 s_goto (OP_E1ARGS); 3875 s_goto (OP_E1ARGS);
3386 }
3387 3876
3388 case OP_E1ARGS: /* eval arguments */ 3877 case OP_E1ARGS: /* eval arguments */
3389 args = cons (SCHEME_V->value, args); 3878 args = cons (SCHEME_V->value, args);
3390 3879
3391 if (is_pair (SCHEME_V->code)) /* continue */ 3880 if (is_pair (SCHEME_V->code)) /* continue */
… …
3402 SCHEME_V->args = cdr (args); 3891 SCHEME_V->args = cdr (args);
3403 s_goto (OP_APPLY); 3892 s_goto (OP_APPLY);
3404 } 3893 }
3405 3894
3406#if USE_TRACING 3895#if USE_TRACING
3407
3408 case OP_TRACING: 3896 case OP_TRACING:
3409 { 3897 {
3410 int tr = SCHEME_V->tracing; 3898 int tr = SCHEME_V->tracing;
3411 3899
3412 SCHEME_V->tracing = ivalue_unchecked (car (args)); 3900 SCHEME_V->tracing = ivalue_unchecked (car (args));
3413 s_return (mk_integer (SCHEME_A_ tr)); 3901 s_return (mk_integer (SCHEME_A_ tr));
3414 } 3902 }
3415
3416#endif 3903#endif
3417 3904
3418 case OP_APPLY: /* apply 'code' to 'args' */ 3905 case OP_APPLY: /* apply 'code' to 'args' */
3419#if USE_TRACING 3906#if USE_TRACING
3420 if (SCHEME_V->tracing) 3907 if (SCHEME_V->tracing)
… …
3434 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3921 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3435 else if (is_foreign (SCHEME_V->code)) 3922 else if (is_foreign (SCHEME_V->code))
3436 { 3923 {
3437 /* Keep nested calls from GC'ing the arglist */ 3924 /* Keep nested calls from GC'ing the arglist */
3438 push_recent_alloc (SCHEME_A_ args, NIL); 3925 push_recent_alloc (SCHEME_A_ args, NIL);
3439 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3926 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3440 3927
3441 s_return (x); 3928 s_return (x);
3442 } 3929 }
3443 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 */
3444 { 3931 {
… …
3474 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3961 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3475 { 3962 {
3476 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3963 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3477 s_return (args != NIL ? car (args) : NIL); 3964 s_return (args != NIL ? car (args) : NIL);
3478 } 3965 }
3479 else 3966
3480 Error_0 ("illegal function"); 3967 Error_0 ("illegal function");
3481 3968
3482 case OP_DOMACRO: /* do macro */ 3969 case OP_DOMACRO: /* do macro */
3483 SCHEME_V->code = SCHEME_V->value; 3970 SCHEME_V->code = SCHEME_V->value;
3484 s_goto (OP_EVAL); 3971 s_goto (OP_EVAL);
3485
3486#if 1
3487 3972
3488 case OP_LAMBDA: /* lambda */ 3973 case OP_LAMBDA: /* lambda */
3489 /* 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
3490 set SCHEME_V->value fall thru */ 3975 set SCHEME_V->value fall thru */
3491 { 3976 {
… …
3498 SCHEME_V->code = slot_value_in_env (f); 3983 SCHEME_V->code = slot_value_in_env (f);
3499 s_goto (OP_APPLY); 3984 s_goto (OP_APPLY);
3500 } 3985 }
3501 3986
3502 SCHEME_V->value = SCHEME_V->code; 3987 SCHEME_V->value = SCHEME_V->code;
3503 /* Fallthru */
3504 } 3988 }
3989 /* Fallthru */
3505 3990
3506 case OP_LAMBDA1: 3991 case OP_LAMBDA1:
3507 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));
3508
3509#else
3510
3511 case OP_LAMBDA: /* lambda */
3512 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3513
3514#endif
3515 3993
3516 case OP_MKCLOSURE: /* make-closure */ 3994 case OP_MKCLOSURE: /* make-closure */
3517 x = car (args); 3995 x = car (args);
3518 3996
3519 if (car (x) == SCHEME_V->LAMBDA) 3997 if (car (x) == SCHEME_V->LAMBDA)
… …
3558 else 4036 else
3559 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);
3560 4038
3561 s_return (SCHEME_V->code); 4039 s_return (SCHEME_V->code);
3562 4040
3563
3564 case OP_DEFP: /* defined? */ 4041 case OP_DEFP: /* defined? */
3565 x = SCHEME_V->envir; 4042 x = SCHEME_V->envir;
3566 4043
3567 if (cdr (args) != NIL) 4044 if (cdr (args) != NIL)
3568 x = cadr (args); 4045 x = cadr (args);
… …
3586 s_return (SCHEME_V->value); 4063 s_return (SCHEME_V->value);
3587 } 4064 }
3588 else 4065 else
3589 Error_1 ("set!: unbound variable:", SCHEME_V->code); 4066 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3590 4067
3591
3592 case OP_BEGIN: /* begin */ 4068 case OP_BEGIN: /* begin */
3593 if (!is_pair (SCHEME_V->code)) 4069 if (!is_pair (SCHEME_V->code))
3594 s_return (SCHEME_V->code); 4070 s_return (SCHEME_V->code);
3595 4071
3596 if (cdr (SCHEME_V->code) != NIL) 4072 if (cdr (SCHEME_V->code) != NIL)
… …
3607 case OP_IF1: /* if */ 4083 case OP_IF1: /* if */
3608 if (is_true (SCHEME_V->value)) 4084 if (is_true (SCHEME_V->value))
3609 SCHEME_V->code = car (SCHEME_V->code); 4085 SCHEME_V->code = car (SCHEME_V->code);
3610 else 4086 else
3611 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
3612 s_goto (OP_EVAL); 4089 s_goto (OP_EVAL);
3613 4090
3614 case OP_LET0: /* let */ 4091 case OP_LET0: /* let */
3615 SCHEME_V->args = NIL; 4092 SCHEME_V->args = NIL;
3616 SCHEME_V->value = SCHEME_V->code; 4093 SCHEME_V->value = SCHEME_V->code;
3617 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);
3618 s_goto (OP_LET1); 4095 s_goto (OP_LET1);
3619 4096
3620 case OP_LET1: /* let (calculate parameters) */ 4097 case OP_LET1: /* let (calculate parameters) */
4098 case OP_LET1REC: /* letrec (calculate parameters) */
3621 args = cons (SCHEME_V->value, args); 4099 args = cons (SCHEME_V->value, args);
3622 4100
3623 if (is_pair (SCHEME_V->code)) /* continue */ 4101 if (is_pair (SCHEME_V->code)) /* continue */
3624 { 4102 {
3625 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)))
3626 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));
3627 4105
3628 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4106 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3629 SCHEME_V->code = cadar (SCHEME_V->code); 4107 SCHEME_V->code = cadar (SCHEME_V->code);
3630 SCHEME_V->args = NIL; 4108 SCHEME_V->args = NIL;
3631 s_goto (OP_EVAL); 4109 s_goto (OP_EVAL);
3632 } 4110 }
3633 else /* end */ 4111
3634 { 4112 /* end */
3635 args = reverse_in_place (SCHEME_A_ NIL, args); 4113 args = reverse_in_place (SCHEME_A_ NIL, args);
3636 SCHEME_V->code = car (args); 4114 SCHEME_V->code = car (args);
3637 SCHEME_V->args = cdr (args); 4115 SCHEME_V->args = cdr (args);
3638 s_goto (OP_LET2); 4116 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3639 }
3640 4117
3641 case OP_LET2: /* let */ 4118 case OP_LET2: /* let */
3642 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4119 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3643 4120
3644 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;
… …
3648 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4125 if (is_symbol (car (SCHEME_V->code))) /* named let */
3649 { 4126 {
3650 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))
3651 { 4128 {
3652 if (!is_pair (x)) 4129 if (!is_pair (x))
3653 Error_1 ("Bad syntax of binding in let :", x); 4130 Error_1 ("Bad syntax of binding in let:", x);
3654 4131
3655 if (!is_list (SCHEME_A_ car (x))) 4132 if (!is_list (SCHEME_A_ car (x)))
3656 Error_1 ("Bad syntax of binding in let :", car (x)); 4133 Error_1 ("Bad syntax of binding in let:", car (x));
3657 4134
3658 args = cons (caar (x), args); 4135 args = cons (caar (x), args);
3659 } 4136 }
3660 4137
3661 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)),
… …
3678 SCHEME_V->code = cdr (SCHEME_V->code); 4155 SCHEME_V->code = cdr (SCHEME_V->code);
3679 s_goto (OP_BEGIN); 4156 s_goto (OP_BEGIN);
3680 } 4157 }
3681 4158
3682 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)))
3683 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));
3684 4161
3685 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));
3686 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4163 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3687 s_goto (OP_EVAL); 4164 s_goto (OP_EVAL);
3688 4165
… …
3699 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4176 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3700 SCHEME_V->code = cadar (SCHEME_V->code); 4177 SCHEME_V->code = cadar (SCHEME_V->code);
3701 SCHEME_V->args = NIL; 4178 SCHEME_V->args = NIL;
3702 s_goto (OP_EVAL); 4179 s_goto (OP_EVAL);
3703 } 4180 }
3704 else /* end */ 4181
4182 /* end */
3705 { 4183
3706 SCHEME_V->code = args; 4184 SCHEME_V->code = args;
3707 SCHEME_V->args = NIL; 4185 SCHEME_V->args = NIL;
3708 s_goto (OP_BEGIN); 4186 s_goto (OP_BEGIN);
3709 }
3710 4187
3711 case OP_LET0REC: /* letrec */ 4188 case OP_LET0REC: /* letrec */
3712 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4189 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3713 SCHEME_V->args = NIL; 4190 SCHEME_V->args = NIL;
3714 SCHEME_V->value = SCHEME_V->code; 4191 SCHEME_V->value = SCHEME_V->code;
3715 SCHEME_V->code = car (SCHEME_V->code); 4192 SCHEME_V->code = car (SCHEME_V->code);
3716 s_goto (OP_LET1REC); 4193 s_goto (OP_LET1REC);
3717 4194
3718 case OP_LET1REC: /* letrec (calculate parameters) */ 4195 /* OP_LET1REC handled by OP_LET1 */
3719 args = cons (SCHEME_V->value, args);
3720
3721 if (is_pair (SCHEME_V->code)) /* continue */
3722 {
3723 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3724 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3725
3726 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3727 SCHEME_V->code = cadar (SCHEME_V->code);
3728 SCHEME_V->args = NIL;
3729 s_goto (OP_EVAL);
3730 }
3731 else /* end */
3732 {
3733 args = reverse_in_place (SCHEME_A_ NIL, args);
3734 SCHEME_V->code = car (args);
3735 SCHEME_V->args = cdr (args);
3736 s_goto (OP_LET2REC);
3737 }
3738 4196
3739 case OP_LET2REC: /* letrec */ 4197 case OP_LET2REC: /* letrec */
3740 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))
3741 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4199 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3742 4200
… …
3772 } 4230 }
3773 else 4231 else
3774 { 4232 {
3775 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4233 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3776 s_return (NIL); 4234 s_return (NIL);
3777 else 4235
3778 {
3779 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4236 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3780 SCHEME_V->code = caar (SCHEME_V->code); 4237 SCHEME_V->code = caar (SCHEME_V->code);
3781 s_goto (OP_EVAL); 4238 s_goto (OP_EVAL);
3782 }
3783 } 4239 }
3784 4240
3785 case OP_DELAY: /* delay */ 4241 case OP_DELAY: /* delay */
3786 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);
3787 set_typeflag (x, T_PROMISE); 4243 set_typeflag (x, T_PROMISE);
… …
3798 case OP_AND1: /* and */ 4254 case OP_AND1: /* and */
3799 if (is_false (SCHEME_V->value)) 4255 if (is_false (SCHEME_V->value))
3800 s_return (SCHEME_V->value); 4256 s_return (SCHEME_V->value);
3801 else if (SCHEME_V->code == NIL) 4257 else if (SCHEME_V->code == NIL)
3802 s_return (SCHEME_V->value); 4258 s_return (SCHEME_V->value);
3803 else 4259
3804 {
3805 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4260 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3806 SCHEME_V->code = car (SCHEME_V->code); 4261 SCHEME_V->code = car (SCHEME_V->code);
3807 s_goto (OP_EVAL); 4262 s_goto (OP_EVAL);
3808 }
3809 4263
3810 case OP_OR0: /* or */ 4264 case OP_OR0: /* or */
3811 if (SCHEME_V->code == NIL) 4265 if (SCHEME_V->code == NIL)
3812 s_return (S_F); 4266 s_return (S_F);
3813 4267
… …
3818 case OP_OR1: /* or */ 4272 case OP_OR1: /* or */
3819 if (is_true (SCHEME_V->value)) 4273 if (is_true (SCHEME_V->value))
3820 s_return (SCHEME_V->value); 4274 s_return (SCHEME_V->value);
3821 else if (SCHEME_V->code == NIL) 4275 else if (SCHEME_V->code == NIL)
3822 s_return (SCHEME_V->value); 4276 s_return (SCHEME_V->value);
3823 else 4277
3824 {
3825 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4278 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3826 SCHEME_V->code = car (SCHEME_V->code); 4279 SCHEME_V->code = car (SCHEME_V->code);
3827 s_goto (OP_EVAL); 4280 s_goto (OP_EVAL);
3828 }
3829 4281
3830 case OP_C0STREAM: /* cons-stream */ 4282 case OP_C0STREAM: /* cons-stream */
3831 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4283 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3832 SCHEME_V->code = car (SCHEME_V->code); 4284 SCHEME_V->code = car (SCHEME_V->code);
3833 s_goto (OP_EVAL); 4285 s_goto (OP_EVAL);
… …
3898 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4350 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3899 SCHEME_V->code = caar (x); 4351 SCHEME_V->code = caar (x);
3900 s_goto (OP_EVAL); 4352 s_goto (OP_EVAL);
3901 } 4353 }
3902 } 4354 }
3903 else 4355
3904 s_return (NIL); 4356 s_return (NIL);
3905 4357
3906 case OP_CASE2: /* case */ 4358 case OP_CASE2: /* case */
3907 if (is_true (SCHEME_V->value)) 4359 if (is_true (SCHEME_V->value))
3908 s_goto (OP_BEGIN); 4360 s_goto (OP_BEGIN);
3909 else 4361
3910 s_return (NIL); 4362 s_return (NIL);
3911 4363
3912 case OP_PAPPLY: /* apply */ 4364 case OP_PAPPLY: /* apply */
3913 SCHEME_V->code = car (args); 4365 SCHEME_V->code = car (args);
3914 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4366 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3915 /*SCHEME_V->args = cadr(args); */ 4367 /*SCHEME_V->args = cadr(args); */
… …
3929 } 4381 }
3930 4382
3931 if (USE_ERROR_CHECKING) abort (); 4383 if (USE_ERROR_CHECKING) abort ();
3932} 4384}
3933 4385
3934static int 4386/* math, cxr */
4387ecb_hot static int
3935opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4388opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3936{ 4389{
3937 pointer args = SCHEME_V->args; 4390 pointer args = SCHEME_V->args;
3938 pointer x = car (args); 4391 pointer x = car (args);
3939 num v; 4392 num v;
3940 4393
3941 switch (op) 4394 switch (op)
3942 { 4395 {
3943#if USE_MATH 4396#if USE_MATH
3944 case OP_INEX2EX: /* inexact->exact */ 4397 case OP_INEX2EX: /* inexact->exact */
3945 {
3946 if (is_integer (x)) 4398 if (!is_integer (x))
3947 s_return (x); 4399 {
3948
3949 RVALUE r = rvalue_unchecked (x); 4400 RVALUE r = rvalue_unchecked (x);
3950 4401
3951 if (r == (RVALUE)(IVALUE)r) 4402 if (r == (RVALUE)(IVALUE)r)
3952 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4403 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3953 else 4404 else
3954 Error_1 ("inexact->exact: not integral:", x); 4405 Error_1 ("inexact->exact: not integral:", x);
3955 } 4406 }
3956 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))));
3957 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))));
3958 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))))));
3959 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))));
3960 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))));
3961 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))));
3962 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))));
3963 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))));
3964 4424
3965 case OP_ATAN: 4425 case OP_ATAN:
4426 s_return (mk_real (SCHEME_A_
3966 if (cdr (args) == NIL) 4427 cdr (args) == NIL
3967 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4428 ? atan (rvalue (x))
3968 else 4429 : atan2 (rvalue (x), rvalue (cadr (args)))));
3969 {
3970 pointer y = cadr (args);
3971 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3972 }
3973
3974 case OP_SQRT:
3975 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3976 4430
3977 case OP_EXPT: 4431 case OP_EXPT:
3978 { 4432 {
3979 RVALUE result; 4433 RVALUE result;
3980 int real_result = 1; 4434 int real_result = 1;
… …
4003 if (real_result) 4457 if (real_result)
4004 s_return (mk_real (SCHEME_A_ result)); 4458 s_return (mk_real (SCHEME_A_ result));
4005 else 4459 else
4006 s_return (mk_integer (SCHEME_A_ result)); 4460 s_return (mk_integer (SCHEME_A_ result));
4007 } 4461 }
4008
4009 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4010 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4011
4012 case OP_TRUNCATE:
4013 {
4014 RVALUE n = rvalue (x);
4015 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4016 }
4017
4018 case OP_ROUND:
4019 if (is_integer (x))
4020 s_return (x);
4021
4022 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4023#endif 4462#endif
4024 4463
4025 case OP_ADD: /* + */ 4464 case OP_ADD: /* + */
4026 v = num_zero; 4465 v = num_zero;
4027 4466
… …
4115 else 4554 else
4116 Error_0 ("modulo: division by zero"); 4555 Error_0 ("modulo: division by zero");
4117 4556
4118 s_return (mk_number (SCHEME_A_ v)); 4557 s_return (mk_number (SCHEME_A_ v));
4119 4558
4120 case OP_CAR: /* car */ 4559 /* the compiler will optimize this mess... */
4121 s_return (caar (args)); 4560 case OP_CAR: op_car: s_return (car (x));
4122 4561 case OP_CDR: op_cdr: s_return (cdr (x));
4123 case OP_CDR: /* cdr */ 4562 case OP_CAAR: op_caar: x = car (x); goto op_car;
4124 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;
4125 4590
4126 case OP_CONS: /* cons */ 4591 case OP_CONS: /* cons */
4127 set_cdr (args, cadr (args)); 4592 set_cdr (args, cadr (args));
4128 s_return (args); 4593 s_return (args);
4129 4594
… …
4303 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4768 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4304 4769
4305 s_return (newstr); 4770 s_return (newstr);
4306 } 4771 }
4307 4772
4308 case OP_SUBSTR: /* substring */ 4773 case OP_STRING_COPY: /* substring/string-copy */
4309 { 4774 {
4310 char *str = strvalue (x); 4775 char *str = strvalue (x);
4311 int index0 = ivalue_unchecked (cadr (args)); 4776 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4312 int index1; 4777 int index1;
4313 int len; 4778 int len;
4314 4779
4315 if (index0 > strlength (x)) 4780 if (index0 > strlength (x))
4316 Error_1 ("substring: start out of bounds:", cadr (args)); 4781 Error_1 ("string->copy: start out of bounds:", cadr (args));
4317 4782
4318 if (cddr (args) != NIL) 4783 if (cddr (args) != NIL)
4319 { 4784 {
4320 index1 = ivalue_unchecked (caddr (args)); 4785 index1 = ivalue_unchecked (caddr (args));
4321 4786
4322 if (index1 > strlength (x) || index1 < index0) 4787 if (index1 > strlength (x) || index1 < index0)
4323 Error_1 ("substring: end out of bounds:", caddr (args)); 4788 Error_1 ("string->copy: end out of bounds:", caddr (args));
4324 } 4789 }
4325 else 4790 else
4326 index1 = strlength (x); 4791 index1 = strlength (x);
4327 4792
4328 len = index1 - index0; 4793 len = index1 - index0;
4329 x = mk_empty_string (SCHEME_A_ len, ' '); 4794 x = mk_counted_string (SCHEME_A_ str + index0, len);
4330 memcpy (strvalue (x), str + index0, len);
4331 strvalue (x)[len] = 0;
4332 4795
4333 s_return (x); 4796 s_return (x);
4334 } 4797 }
4335 4798
4336 case OP_VECTOR: /* vector */ 4799 case OP_VECTOR: /* vector */
… …
4378 } 4841 }
4379 4842
4380 case OP_VECLEN: /* vector-length */ 4843 case OP_VECLEN: /* vector-length */
4381 s_return (mk_integer (SCHEME_A_ veclength (x))); 4844 s_return (mk_integer (SCHEME_A_ veclength (x)));
4382 4845
4846 case OP_VECRESIZE:
4847 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4848 s_return (x);
4849
4383 case OP_VECREF: /* vector-ref */ 4850 case OP_VECREF: /* vector-ref */
4384 { 4851 {
4385 int index = ivalue_unchecked (cadr (args)); 4852 int index = ivalue_unchecked (cadr (args));
4386 4853
4387 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4854 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
… …
4406 } 4873 }
4407 4874
4408 if (USE_ERROR_CHECKING) abort (); 4875 if (USE_ERROR_CHECKING) abort ();
4409} 4876}
4410 4877
4411static int 4878/* relational ops */
4879ecb_hot static int
4412opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4880opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4413{ 4881{
4414 pointer x = SCHEME_V->args; 4882 pointer x = SCHEME_V->args;
4415 4883
4416 for (;;) 4884 for (;;)
… …
4437 } 4905 }
4438 4906
4439 s_return (S_T); 4907 s_return (S_T);
4440} 4908}
4441 4909
4442static int 4910/* predicates */
4911ecb_hot static int
4443opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4912opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4444{ 4913{
4445 pointer args = SCHEME_V->args; 4914 pointer args = SCHEME_V->args;
4446 pointer a = car (args); 4915 pointer a = car (args);
4447 pointer d = cdr (args); 4916 pointer d = cdr (args);
4448 int r; 4917 int r;
4449 4918
4450 switch (op) 4919 switch (op)
4451 { 4920 {
4452 case OP_NOT: /* not */ r = is_false (a) ; break; 4921 case OP_NOT: /* not */ r = is_false (a) ; break;
4453 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;
4454 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4923 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4455 case OP_NULLP: /* null? */ r = a == NIL ; break; 4924 case OP_NULLP: /* null? */ r = a == NIL ; break;
4456 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;
4457 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4927 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4458 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4928 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4459 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4929 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4460 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 */
4461 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4931 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4462 4932
4463#if USE_CHAR_CLASSIFIERS 4933#if USE_CHAR_CLASSIFIERS
4464 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4934 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4465 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4935 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4466 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4936 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
… …
4493 } 4963 }
4494 4964
4495 s_retbool (r); 4965 s_retbool (r);
4496} 4966}
4497 4967
4498static int 4968/* promises, list ops, ports */
4969ecb_hot static int
4499opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4970opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4500{ 4971{
4501 pointer args = SCHEME_V->args; 4972 pointer args = SCHEME_V->args;
4502 pointer a = car (args); 4973 pointer a = car (args);
4503 pointer x, y; 4974 pointer x, y;
… …
4516 } 4987 }
4517 else 4988 else
4518 s_return (SCHEME_V->code); 4989 s_return (SCHEME_V->code);
4519 4990
4520 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4991 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4521 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4992 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4522 s_return (SCHEME_V->value); 4993 s_return (SCHEME_V->value);
4523 4994
4524#if USE_PORTS 4995#if USE_PORTS
4996
4997 case OP_EOF_OBJECT: /* eof-object */
4998 s_return (S_EOF);
4525 4999
4526 case OP_WRITE: /* write */ 5000 case OP_WRITE: /* write */
4527 case OP_DISPLAY: /* display */ 5001 case OP_DISPLAY: /* display */
4528 case OP_WRITE_CHAR: /* write-char */ 5002 case OP_WRITE_CHAR: /* write-char */
4529 if (is_pair (cdr (SCHEME_V->args))) 5003 if (is_pair (cdr (SCHEME_V->args)))
… …
4543 else 5017 else
4544 SCHEME_V->print_flag = 0; 5018 SCHEME_V->print_flag = 0;
4545 5019
4546 s_goto (OP_P0LIST); 5020 s_goto (OP_P0LIST);
4547 5021
5022 //TODO: move to scheme
4548 case OP_NEWLINE: /* newline */ 5023 case OP_NEWLINE: /* newline */
4549 if (is_pair (args)) 5024 if (is_pair (args))
4550 { 5025 {
4551 if (a != SCHEME_V->outport) 5026 if (a != SCHEME_V->outport)
4552 { 5027 {
… …
4554 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 5029 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4555 SCHEME_V->outport = a; 5030 SCHEME_V->outport = a;
4556 } 5031 }
4557 } 5032 }
4558 5033
4559 putstr (SCHEME_A_ "\n"); 5034 putcharacter (SCHEME_A_ '\n');
4560 s_return (S_T); 5035 s_return (S_T);
4561#endif 5036#endif
4562 5037
4563 case OP_ERR0: /* error */ 5038 case OP_ERR0: /* error */
4564 SCHEME_V->retcode = -1; 5039 SCHEME_V->retcode = -1;
… …
4573 putstr (SCHEME_A_ strvalue (car (args))); 5048 putstr (SCHEME_A_ strvalue (car (args)));
4574 SCHEME_V->args = cdr (args); 5049 SCHEME_V->args = cdr (args);
4575 s_goto (OP_ERR1); 5050 s_goto (OP_ERR1);
4576 5051
4577 case OP_ERR1: /* error */ 5052 case OP_ERR1: /* error */
4578 putstr (SCHEME_A_ " "); 5053 putcharacter (SCHEME_A_ ' ');
4579 5054
4580 if (args != NIL) 5055 if (args != NIL)
4581 { 5056 {
4582 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 5057 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4583 SCHEME_V->args = a; 5058 SCHEME_V->args = a;
4584 SCHEME_V->print_flag = 1; 5059 SCHEME_V->print_flag = 1;
4585 s_goto (OP_P0LIST); 5060 s_goto (OP_P0LIST);
4586 } 5061 }
4587 else 5062 else
4588 { 5063 {
4589 putstr (SCHEME_A_ "\n"); 5064 putcharacter (SCHEME_A_ '\n');
4590 5065
4591 if (SCHEME_V->interactive_repl) 5066 if (SCHEME_V->interactive_repl)
4592 s_goto (OP_T0LVL); 5067 s_goto (OP_T0LVL);
4593 else 5068 else
4594 return -1; 5069 return -1;
… …
4671 SCHEME_V->gc_verbose = (a != S_F); 5146 SCHEME_V->gc_verbose = (a != S_F);
4672 s_retbool (was); 5147 s_retbool (was);
4673 } 5148 }
4674 5149
4675 case OP_NEWSEGMENT: /* new-segment */ 5150 case OP_NEWSEGMENT: /* new-segment */
5151#if 0
4676 if (!is_pair (args) || !is_number (a)) 5152 if (!is_pair (args) || !is_number (a))
4677 Error_0 ("new-segment: argument must be a number"); 5153 Error_0 ("new-segment: argument must be a number");
4678 5154#endif
4679 alloc_cellseg (SCHEME_A_ ivalue (a)); 5155 s_retbool (alloc_cellseg (SCHEME_A));
4680
4681 s_return (S_T);
4682 5156
4683 case OP_OBLIST: /* oblist */ 5157 case OP_OBLIST: /* oblist */
4684 s_return (oblist_all_symbols (SCHEME_A)); 5158 s_return (oblist_all_symbols (SCHEME_A));
4685 5159
4686#if USE_PORTS 5160#if USE_PORTS
… …
4756 s_return (p == NIL ? S_F : p); 5230 s_return (p == NIL ? S_F : p);
4757 } 5231 }
4758 5232
4759 case OP_GET_OUTSTRING: /* get-output-string */ 5233 case OP_GET_OUTSTRING: /* get-output-string */
4760 { 5234 {
4761 port *p; 5235 port *p = port (a);
4762 5236
4763 if ((p = a->object.port)->kind & port_string) 5237 if (p->kind & port_string)
4764 { 5238 {
4765 off_t size; 5239 off_t size;
4766 char *str; 5240 char *str;
4767 5241
4768 size = p->rep.string.curr - p->rep.string.start + 1; 5242 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4803 } 5277 }
4804 5278
4805 if (USE_ERROR_CHECKING) abort (); 5279 if (USE_ERROR_CHECKING) abort ();
4806} 5280}
4807 5281
4808static int 5282/* reading */
5283ecb_cold static int
4809opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5284opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4810{ 5285{
4811 pointer args = SCHEME_V->args; 5286 pointer args = SCHEME_V->args;
4812 pointer x; 5287 pointer x;
4813 5288
… …
4873 int res; 5348 int res;
4874 5349
4875 if (is_pair (args)) 5350 if (is_pair (args))
4876 p = car (args); 5351 p = car (args);
4877 5352
4878 res = p->object.port->kind & port_string; 5353 res = port (p)->kind & port_string;
4879 5354
4880 s_retbool (res); 5355 s_retbool (res);
4881 } 5356 }
4882 5357
4883 case OP_SET_INPORT: /* set-input-port */ 5358 case OP_SET_INPORT: /* set-input-port */
… …
4892 case OP_RDSEXPR: 5367 case OP_RDSEXPR:
4893 switch (SCHEME_V->tok) 5368 switch (SCHEME_V->tok)
4894 { 5369 {
4895 case TOK_EOF: 5370 case TOK_EOF:
4896 s_return (S_EOF); 5371 s_return (S_EOF);
4897 /* NOTREACHED */
4898 5372
4899 case TOK_VEC: 5373 case TOK_VEC:
4900 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5374 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
4901 /* fall through */ 5375 /* fall through */
4902 5376
… …
4905 5379
4906 if (SCHEME_V->tok == TOK_RPAREN) 5380 if (SCHEME_V->tok == TOK_RPAREN)
4907 s_return (NIL); 5381 s_return (NIL);
4908 else if (SCHEME_V->tok == TOK_DOT) 5382 else if (SCHEME_V->tok == TOK_DOT)
4909 Error_0 ("syntax error: illegal dot expression"); 5383 Error_0 ("syntax error: illegal dot expression");
4910 else 5384
4911 {
4912 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5385 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
4913 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5386 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
4914 s_goto (OP_RDSEXPR); 5387 s_goto (OP_RDSEXPR);
4915 }
4916 5388
4917 case TOK_QUOTE: 5389 case TOK_QUOTE:
4918 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5390 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
4919 SCHEME_V->tok = token (SCHEME_A); 5391 SCHEME_V->tok = token (SCHEME_A);
4920 s_goto (OP_RDSEXPR); 5392 s_goto (OP_RDSEXPR);
… …
4926 { 5398 {
4927 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5399 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
4928 SCHEME_V->tok = TOK_LPAREN; 5400 SCHEME_V->tok = TOK_LPAREN;
4929 s_goto (OP_RDSEXPR); 5401 s_goto (OP_RDSEXPR);
4930 } 5402 }
4931 else 5403
4932 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5404 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
4933
4934 s_goto (OP_RDSEXPR); 5405 s_goto (OP_RDSEXPR);
4935 5406
4936 case TOK_COMMA: 5407 case TOK_COMMA:
4937 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5408 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
4938 SCHEME_V->tok = token (SCHEME_A); 5409 SCHEME_V->tok = token (SCHEME_A);
… …
4948 5419
4949 case TOK_DOTATOM: 5420 case TOK_DOTATOM:
4950 SCHEME_V->strbuff[0] = '.'; 5421 SCHEME_V->strbuff[0] = '.';
4951 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)));
4952 5423
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
5427 x = readstrexp (SCHEME_A_ '|');
5428 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5429
4953 case TOK_DQUOTE: 5430 case TOK_DQUOTE:
4954 x = readstrexp (SCHEME_A_ '"'); 5431 x = readstrexp (SCHEME_A_ '"');
4955 5432
4956 if (x == S_F) 5433 if (x == S_F)
4957 Error_0 ("Error reading string"); 5434 Error_0 ("Error reading string");
… …
4963 { 5440 {
4964 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);
4965 5442
4966 if (f == NIL) 5443 if (f == NIL)
4967 Error_0 ("undefined sharp expression"); 5444 Error_0 ("undefined sharp expression");
4968 else 5445
4969 {
4970 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5446 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
4971 s_goto (OP_EVAL); 5447 s_goto (OP_EVAL);
4972 }
4973 } 5448 }
4974 5449
4975 case TOK_SHARP_CONST: 5450 case TOK_SHARP_CONST:
4976 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)
4977 Error_0 ("undefined sharp expression"); 5452 Error_0 ("undefined sharp expression");
4978 else 5453
4979 s_return (x); 5454 s_return (x);
4980 5455
4981 default: 5456 default:
4982 Error_0 ("syntax error: illegal token"); 5457 Error_0 ("syntax error: illegal token");
4983 } 5458 }
4984 5459
… …
5077 pointer b = cdr (args); 5552 pointer b = cdr (args);
5078 int ok_abbr = ok_abbrev (b); 5553 int ok_abbr = ok_abbrev (b);
5079 SCHEME_V->args = car (b); 5554 SCHEME_V->args = car (b);
5080 5555
5081 if (a == SCHEME_V->QUOTE && ok_abbr) 5556 if (a == SCHEME_V->QUOTE && ok_abbr)
5082 putstr (SCHEME_A_ "'"); 5557 putcharacter (SCHEME_A_ '\'');
5083 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5558 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5084 putstr (SCHEME_A_ "`"); 5559 putcharacter (SCHEME_A_ '`');
5085 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5560 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5086 putstr (SCHEME_A_ ","); 5561 putcharacter (SCHEME_A_ ',');
5087 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5562 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5088 putstr (SCHEME_A_ ",@"); 5563 putstr (SCHEME_A_ ",@");
5089 else 5564 else
5090 { 5565 {
5091 putstr (SCHEME_A_ "("); 5566 putcharacter (SCHEME_A_ '(');
5092 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5567 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5093 SCHEME_V->args = a; 5568 SCHEME_V->args = a;
5094 } 5569 }
5095 5570
5096 s_goto (OP_P0LIST); 5571 s_goto (OP_P0LIST);
… …
5098 5573
5099 case OP_P1LIST: 5574 case OP_P1LIST:
5100 if (is_pair (args)) 5575 if (is_pair (args))
5101 { 5576 {
5102 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5577 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5103 putstr (SCHEME_A_ " "); 5578 putcharacter (SCHEME_A_ ' ');
5104 SCHEME_V->args = car (args); 5579 SCHEME_V->args = car (args);
5105 s_goto (OP_P0LIST); 5580 s_goto (OP_P0LIST);
5106 } 5581 }
5107 else if (is_vector (args)) 5582 else if (is_vector (args))
5108 { 5583 {
… …
5116 { 5591 {
5117 putstr (SCHEME_A_ " . "); 5592 putstr (SCHEME_A_ " . ");
5118 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5593 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5119 } 5594 }
5120 5595
5121 putstr (SCHEME_A_ ")"); 5596 putcharacter (SCHEME_A_ ')');
5122 s_return (S_T); 5597 s_return (S_T);
5123 } 5598 }
5124 5599
5125 case OP_PVECFROM: 5600 case OP_PVECFROM:
5126 { 5601 {
… …
5128 pointer vec = car (args); 5603 pointer vec = car (args);
5129 int len = veclength (vec); 5604 int len = veclength (vec);
5130 5605
5131 if (i == len) 5606 if (i == len)
5132 { 5607 {
5133 putstr (SCHEME_A_ ")"); 5608 putcharacter (SCHEME_A_ ')');
5134 s_return (S_T); 5609 s_return (S_T);
5135 } 5610 }
5136 else 5611 else
5137 { 5612 {
5138 pointer elem = vector_get (vec, i); 5613 pointer elem = vector_get (vec, i);
… …
5140 ivalue_unchecked (cdr (args)) = i + 1; 5615 ivalue_unchecked (cdr (args)) = i + 1;
5141 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5616 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5142 SCHEME_V->args = elem; 5617 SCHEME_V->args = elem;
5143 5618
5144 if (i > 0) 5619 if (i > 0)
5145 putstr (SCHEME_A_ " "); 5620 putcharacter (SCHEME_A_ ' ');
5146 5621
5147 s_goto (OP_P0LIST); 5622 s_goto (OP_P0LIST);
5148 } 5623 }
5149 } 5624 }
5150 } 5625 }
5151 5626
5152 if (USE_ERROR_CHECKING) abort (); 5627 if (USE_ERROR_CHECKING) abort ();
5153} 5628}
5154 5629
5155static int 5630/* list ops */
5631ecb_hot static int
5156opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5632opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5157{ 5633{
5158 pointer args = SCHEME_V->args; 5634 pointer args = SCHEME_V->args;
5159 pointer a = car (args); 5635 pointer a = car (args);
5160 pointer x, y; 5636 pointer x, y;
… …
5183 break; 5659 break;
5184 } 5660 }
5185 5661
5186 if (is_pair (y)) 5662 if (is_pair (y))
5187 s_return (car (y)); 5663 s_return (car (y));
5188 else 5664
5189 s_return (S_F); 5665 s_return (S_F);
5190
5191 5666
5192 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5667 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5193 SCHEME_V->args = a; 5668 SCHEME_V->args = a;
5194 5669
5195 if (SCHEME_V->args == NIL) 5670 if (SCHEME_V->args == NIL)
5196 s_return (S_F); 5671 s_return (S_F);
5197 else if (is_closure (SCHEME_V->args)) 5672 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5198 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5673 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5199 else if (is_macro (SCHEME_V->args)) 5674
5200 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5201 else
5202 s_return (S_F); 5675 s_return (S_F);
5203 5676
5204 case OP_CLOSUREP: /* closure? */ 5677 case OP_CLOSUREP: /* closure? */
5205 /* 5678 /*
5206 * Note, macro object is also a closure. 5679 * Note, macro object is also a closure.
5207 * Therefore, (closure? <#MACRO>) ==> #t 5680 * Therefore, (closure? <#MACRO>) ==> #t
5681 * (schmorp) well, obviously not, fix? TODO
5208 */ 5682 */
5209 s_retbool (is_closure (a)); 5683 s_retbool (is_closure (a));
5210 5684
5211 case OP_MACROP: /* macro? */ 5685 case OP_MACROP: /* macro? */
5212 s_retbool (is_macro (a)); 5686 s_retbool (is_macro (a));
… …
5217 5691
5218/* 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 */
5219typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5693typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5220 5694
5221typedef int (*test_predicate)(pointer); 5695typedef int (*test_predicate)(pointer);
5222static int 5696
5697ecb_hot static int
5223tst_any (pointer p) 5698tst_any (pointer p)
5224{ 5699{
5225 return 1; 5700 return 1;
5226} 5701}
5227 5702
5228static int 5703ecb_hot static int
5229tst_inonneg (pointer p) 5704tst_inonneg (pointer p)
5230{ 5705{
5231 return is_integer (p) && ivalue_unchecked (p) >= 0; 5706 return is_integer (p) && ivalue_unchecked (p) >= 0;
5232} 5707}
5233 5708
5234static int 5709ecb_hot static int
5235tst_is_list (SCHEME_P_ pointer p) 5710tst_is_list (SCHEME_P_ pointer p)
5236{ 5711{
5237 return p == NIL || is_pair (p); 5712 return p == NIL || is_pair (p);
5238} 5713}
5239 5714
… …
5282#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5757#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5283#include "opdefines.h" 5758#include "opdefines.h"
5284#undef OP_DEF 5759#undef OP_DEF
5285; 5760;
5286 5761
5287static const char * 5762ecb_cold static const char *
5288opname (int idx) 5763opname (int idx)
5289{ 5764{
5290 const char *name = opnames; 5765 const char *name = opnames;
5291 5766
5292 /* 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? */
… …
5294 name += strlen (name) + 1; 5769 name += strlen (name) + 1;
5295 5770
5296 return *name ? name : "ILLEGAL"; 5771 return *name ? name : "ILLEGAL";
5297} 5772}
5298 5773
5299static const char * 5774ecb_cold static const char *
5300procname (pointer x) 5775procname (pointer x)
5301{ 5776{
5302 return opname (procnum (x)); 5777 return opname (procnum (x));
5303} 5778}
5304 5779
… …
5324#undef OP_DEF 5799#undef OP_DEF
5325 {0} 5800 {0}
5326}; 5801};
5327 5802
5328/* kernel of this interpreter */ 5803/* kernel of this interpreter */
5329static void ecb_hot 5804ecb_hot static void
5330Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5805Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5331{ 5806{
5332 SCHEME_V->op = op; 5807 SCHEME_V->op = op;
5333 5808
5334 for (;;) 5809 for (;;)
… …
5417 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))
5418 return; 5893 return;
5419 5894
5420 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5895 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5421 { 5896 {
5422 xwrstr ("No memory!\n"); 5897 putstr (SCHEME_A_ "No memory!\n");
5423 return; 5898 return;
5424 } 5899 }
5425 } 5900 }
5426} 5901}
5427 5902
5428/* ========== Initialization of internal keywords ========== */ 5903/* ========== Initialization of internal keywords ========== */
5429 5904
5430static void 5905ecb_cold static void
5431assign_syntax (SCHEME_P_ const char *name) 5906assign_syntax (SCHEME_P_ const char *name)
5432{ 5907{
5433 pointer x = oblist_add_by_name (SCHEME_A_ name); 5908 pointer x = oblist_add_by_name (SCHEME_A_ name);
5434 set_typeflag (x, typeflag (x) | T_SYNTAX); 5909 set_typeflag (x, typeflag (x) | T_SYNTAX);
5435} 5910}
5436 5911
5437static void 5912ecb_cold static void
5438assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5913assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5439{ 5914{
5440 pointer x = mk_symbol (SCHEME_A_ name); 5915 pointer x = mk_symbol (SCHEME_A_ name);
5441 pointer y = mk_proc (SCHEME_A_ op); 5916 pointer y = mk_proc (SCHEME_A_ op);
5442 new_slot_in_env (SCHEME_A_ x, y); 5917 new_slot_in_env (SCHEME_A_ x, y);
… …
5450 ivalue_unchecked (y) = op; 5925 ivalue_unchecked (y) = op;
5451 return y; 5926 return y;
5452} 5927}
5453 5928
5454/* 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! */
5455static int 5930ecb_hot static int
5456syntaxnum (pointer p) 5931syntaxnum (pointer p)
5457{ 5932{
5458 const char *s = strvalue (car (p)); 5933 const char *s = strvalue (p);
5459 5934
5460 switch (strlength (car (p))) 5935 switch (strlength (p))
5461 { 5936 {
5462 case 2: 5937 case 2:
5463 if (s[0] == 'i') 5938 if (s[0] == 'i')
5464 return OP_IF0; /* if */ 5939 return OP_IF0; /* if */
5465 else 5940 else
… …
5539 6014
5540ecb_cold int 6015ecb_cold int
5541scheme_init (SCHEME_P) 6016scheme_init (SCHEME_P)
5542{ 6017{
5543 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 6018 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5544 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));
5545 6025
5546 num_set_fixnum (num_zero, 1); 6026 num_set_fixnum (num_zero, 1);
5547 num_set_ivalue (num_zero, 0); 6027 num_set_ivalue (num_zero, 0);
5548 num_set_fixnum (num_one, 1); 6028 num_set_fixnum (num_one, 1);
5549 num_set_ivalue (num_one, 1); 6029 num_set_ivalue (num_one, 1);
… …
5561 SCHEME_V->save_inport = NIL; 6041 SCHEME_V->save_inport = NIL;
5562 SCHEME_V->loadport = NIL; 6042 SCHEME_V->loadport = NIL;
5563 SCHEME_V->nesting = 0; 6043 SCHEME_V->nesting = 0;
5564 SCHEME_V->interactive_repl = 0; 6044 SCHEME_V->interactive_repl = 0;
5565 6045
5566 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 6046 if (!alloc_cellseg (SCHEME_A))
5567 { 6047 {
5568#if USE_ERROR_CHECKING 6048#if USE_ERROR_CHECKING
5569 SCHEME_V->no_memory = 1; 6049 SCHEME_V->no_memory = 1;
5570 return 0; 6050 return 0;
5571#endif 6051#endif
5572 } 6052 }
5573 6053
5574 SCHEME_V->gc_verbose = 0; 6054 SCHEME_V->gc_verbose = 0;
5575 dump_stack_initialize (SCHEME_A); 6055 dump_stack_initialize (SCHEME_A);
5576 SCHEME_V->code = NIL; 6056 SCHEME_V->code = NIL;
5577 SCHEME_V->args = NIL; 6057 SCHEME_V->args = NIL;
5578 SCHEME_V->envir = NIL; 6058 SCHEME_V->envir = NIL;
6059 SCHEME_V->value = NIL;
5579 SCHEME_V->tracing = 0; 6060 SCHEME_V->tracing = 0;
5580 6061
5581 /* init NIL */ 6062 /* init NIL */
5582 set_typeflag (NIL, T_ATOM | T_MARK); 6063 set_typeflag (NIL, T_SPECIAL | T_ATOM);
5583 set_car (NIL, NIL); 6064 set_car (NIL, NIL);
5584 set_cdr (NIL, NIL); 6065 set_cdr (NIL, NIL);
5585 /* init T */ 6066 /* init T */
5586 set_typeflag (S_T, T_ATOM | T_MARK); 6067 set_typeflag (S_T, T_SPECIAL | T_ATOM);
5587 set_car (S_T, S_T); 6068 set_car (S_T, S_T);
5588 set_cdr (S_T, S_T); 6069 set_cdr (S_T, S_T);
5589 /* init F */ 6070 /* init F */
5590 set_typeflag (S_F, T_ATOM | T_MARK); 6071 set_typeflag (S_F, T_SPECIAL | T_ATOM);
5591 set_car (S_F, S_F); 6072 set_car (S_F, S_F);
5592 set_cdr (S_F, S_F); 6073 set_cdr (S_F, S_F);
5593 /* init EOF_OBJ */ 6074 /* init EOF_OBJ */
5594 set_typeflag (S_EOF, T_ATOM | T_MARK); 6075 set_typeflag (S_EOF, T_SPECIAL | T_ATOM);
5595 set_car (S_EOF, S_EOF); 6076 set_car (S_EOF, S_EOF);
5596 set_cdr (S_EOF, S_EOF); 6077 set_cdr (S_EOF, S_EOF);
5597 /* init sink */ 6078 /* init sink */
5598 set_typeflag (S_SINK, T_PAIR | T_MARK); 6079 set_typeflag (S_SINK, T_PAIR);
5599 set_car (S_SINK, NIL); 6080 set_car (S_SINK, NIL);
5600 6081
5601 /* init c_nest */ 6082 /* init c_nest */
5602 SCHEME_V->c_nest = NIL; 6083 SCHEME_V->c_nest = NIL;
5603 6084
5604 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 6085 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5605 /* init global_env */ 6086 /* init global_env */
5606 new_frame_in_env (SCHEME_A_ NIL); 6087 new_frame_in_env (SCHEME_A_ NIL);
5607 SCHEME_V->global_env = SCHEME_V->envir; 6088 SCHEME_V->global_env = SCHEME_V->envir;
5608 /* init else */ 6089 /* init else */
5609 x = mk_symbol (SCHEME_A_ "else"); 6090 new_slot_in_env (SCHEME_A_ mk_symbol (SCHEME_A_ "else"), S_T);
5610 new_slot_in_env (SCHEME_A_ x, S_T);
5611 6091
5612 { 6092 {
5613 static const char *syntax_names[] = { 6093 static const char *syntax_names[] = {
5614 "lambda", "quote", "define", "if", "begin", "set!", 6094 "lambda", "quote", "define", "if", "begin", "set!",
5615 "let", "let*", "letrec", "cond", "delay", "and", 6095 "let", "let*", "letrec", "cond", "delay", "and",
… …
5639 6119
5640 return !SCHEME_V->no_memory; 6120 return !SCHEME_V->no_memory;
5641} 6121}
5642 6122
5643#if USE_PORTS 6123#if USE_PORTS
5644void 6124ecb_cold void
5645scheme_set_input_port_file (SCHEME_P_ int fin) 6125scheme_set_input_port_file (SCHEME_P_ int fin)
5646{ 6126{
5647 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6127 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5648} 6128}
5649 6129
5650void 6130ecb_cold void
5651scheme_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)
5652{ 6132{
5653 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);
5654} 6134}
5655 6135
5656void 6136ecb_cold void
5657scheme_set_output_port_file (SCHEME_P_ int fout) 6137scheme_set_output_port_file (SCHEME_P_ int fout)
5658{ 6138{
5659 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6139 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5660} 6140}
5661 6141
5662void 6142ecb_cold void
5663scheme_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)
5664{ 6144{
5665 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);
5666} 6146}
5667#endif 6147#endif
5668 6148
5669void 6149ecb_cold void
5670scheme_set_external_data (SCHEME_P_ void *p) 6150scheme_set_external_data (SCHEME_P_ void *p)
5671{ 6151{
5672 SCHEME_V->ext_data = p; 6152 SCHEME_V->ext_data = p;
5673} 6153}
5674 6154
… …
5706 SCHEME_V->loadport = NIL; 6186 SCHEME_V->loadport = NIL;
5707 SCHEME_V->gc_verbose = 0; 6187 SCHEME_V->gc_verbose = 0;
5708 gc (SCHEME_A_ NIL, NIL); 6188 gc (SCHEME_A_ NIL, NIL);
5709 6189
5710 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6190 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5711 free (SCHEME_V->alloc_seg[i]); 6191 free (SCHEME_V->cell_seg[i]);
5712 6192
5713#if SHOW_ERROR_LINE 6193#if SHOW_ERROR_LINE
5714 for (i = 0; i <= SCHEME_V->file_i; i++) 6194 for (i = 0; i <= SCHEME_V->file_i; i++)
5715 {
5716 if (SCHEME_V->load_stack[i].kind & port_file) 6195 if (SCHEME_V->load_stack[i].kind & port_file)
5717 { 6196 {
5718 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6197 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5719 6198
5720 if (fname) 6199 if (fname)
5721 free (fname); 6200 free (fname);
5722 } 6201 }
5723 }
5724#endif 6202#endif
5725} 6203}
5726 6204
5727void 6205ecb_cold void
5728scheme_load_file (SCHEME_P_ int fin) 6206scheme_load_file (SCHEME_P_ int fin)
5729{ 6207{
5730 scheme_load_named_file (SCHEME_A_ fin, 0); 6208 scheme_load_named_file (SCHEME_A_ fin, 0);
5731} 6209}
5732 6210
5733void 6211ecb_cold void
5734scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6212scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5735{ 6213{
5736 dump_stack_reset (SCHEME_A); 6214 dump_stack_reset (SCHEME_A);
5737 SCHEME_V->envir = SCHEME_V->global_env; 6215 SCHEME_V->envir = SCHEME_V->global_env;
5738 SCHEME_V->file_i = 0; 6216 SCHEME_V->file_i = 0;
5739 SCHEME_V->load_stack[0].unget = -1; 6217 SCHEME_V->load_stack[0].unget = -1;
5740 SCHEME_V->load_stack[0].kind = port_input | port_file; 6218 SCHEME_V->load_stack[0].kind = port_input | port_file;
5741 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6219 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5742#if USE_PORTS
5743 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6220 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5744#endif
5745 SCHEME_V->retcode = 0; 6221 SCHEME_V->retcode = 0;
5746 6222
5747#if USE_PORTS
5748 if (fin == STDIN_FILENO) 6223 if (fin == STDIN_FILENO)
5749 SCHEME_V->interactive_repl = 1; 6224 SCHEME_V->interactive_repl = 1;
5750#endif
5751 6225
5752#if USE_PORTS 6226#if USE_PORTS
5753#if SHOW_ERROR_LINE 6227#if SHOW_ERROR_LINE
5754 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6228 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5755 6229
… …
5759#endif 6233#endif
5760 6234
5761 SCHEME_V->inport = SCHEME_V->loadport; 6235 SCHEME_V->inport = SCHEME_V->loadport;
5762 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6236 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5763 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6237 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6238
5764 set_typeflag (SCHEME_V->loadport, T_ATOM); 6239 set_typeflag (SCHEME_V->loadport, T_ATOM);
5765 6240
5766 if (SCHEME_V->retcode == 0) 6241 if (SCHEME_V->retcode == 0)
5767 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6242 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5768} 6243}
5769 6244
5770void 6245ecb_cold void
5771scheme_load_string (SCHEME_P_ const char *cmd) 6246scheme_load_string (SCHEME_P_ const char *cmd)
5772{ 6247{
6248#if USE_PORTs
5773 dump_stack_reset (SCHEME_A); 6249 dump_stack_reset (SCHEME_A);
5774 SCHEME_V->envir = SCHEME_V->global_env; 6250 SCHEME_V->envir = SCHEME_V->global_env;
5775 SCHEME_V->file_i = 0; 6251 SCHEME_V->file_i = 0;
5776 SCHEME_V->load_stack[0].kind = port_input | port_string; 6252 SCHEME_V->load_stack[0].kind = port_input | port_string;
5777 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 */
5778 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);
5779 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 6255 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5780#if USE_PORTS
5781 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6256 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5782#endif
5783 SCHEME_V->retcode = 0; 6257 SCHEME_V->retcode = 0;
5784 SCHEME_V->interactive_repl = 0; 6258 SCHEME_V->interactive_repl = 0;
5785 SCHEME_V->inport = SCHEME_V->loadport; 6259 SCHEME_V->inport = SCHEME_V->loadport;
5786 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6260 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5787 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6261 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5788 set_typeflag (SCHEME_V->loadport, T_ATOM); 6262 set_typeflag (SCHEME_V->loadport, T_ATOM);
5789 6263
5790 if (SCHEME_V->retcode == 0) 6264 if (SCHEME_V->retcode == 0)
5791 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6265 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6266#else
6267 abort ();
6268#endif
5792} 6269}
5793 6270
5794void 6271ecb_cold void
5795scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6272scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5796{ 6273{
5797 pointer x; 6274 pointer x;
5798 6275
5799 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6276 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5804 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6281 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5805} 6282}
5806 6283
5807#if !STANDALONE 6284#if !STANDALONE
5808 6285
5809void 6286ecb_cold void
5810scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6287scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5811{ 6288{
5812 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));
5813} 6290}
5814 6291
5815void 6292ecb_cold void
5816scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6293scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5817{ 6294{
5818 int i; 6295 int i;
5819 6296
5820 for (i = 0; i < count; i++) 6297 for (i = 0; i < count; i++)
5821 scheme_register_foreign_func (SCHEME_A_ list + i); 6298 scheme_register_foreign_func (SCHEME_A_ list + i);
5822} 6299}
5823 6300
5824pointer 6301ecb_cold pointer
5825scheme_apply0 (SCHEME_P_ const char *procname) 6302scheme_apply0 (SCHEME_P_ const char *procname)
5826{ 6303{
5827 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));
5828} 6305}
5829 6306
5830void 6307ecb_cold void
5831save_from_C_call (SCHEME_P) 6308save_from_C_call (SCHEME_P)
5832{ 6309{
5833 pointer saved_data = cons (car (S_SINK), 6310 pointer saved_data = cons (car (S_SINK),
5834 cons (SCHEME_V->envir, 6311 cons (SCHEME_V->envir,
5835 SCHEME_V->dump)); 6312 SCHEME_V->dump));
… …
5839 /* 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
5840 directly resume pre-C-call operations. */ 6317 directly resume pre-C-call operations. */
5841 dump_stack_reset (SCHEME_A); 6318 dump_stack_reset (SCHEME_A);
5842} 6319}
5843 6320
5844void 6321ecb_cold void
5845restore_from_C_call (SCHEME_P) 6322restore_from_C_call (SCHEME_P)
5846{ 6323{
5847 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6324 set_car (S_SINK, caar (SCHEME_V->c_nest));
5848 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6325 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5849 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6326 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5850 /* Pop */ 6327 /* Pop */
5851 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6328 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5852} 6329}
5853 6330
5854/* "func" and "args" are assumed to be already eval'ed. */ 6331/* "func" and "args" are assumed to be already eval'ed. */
5855pointer 6332ecb_cold pointer
5856scheme_call (SCHEME_P_ pointer func, pointer args) 6333scheme_call (SCHEME_P_ pointer func, pointer args)
5857{ 6334{
5858 int old_repl = SCHEME_V->interactive_repl; 6335 int old_repl = SCHEME_V->interactive_repl;
5859 6336
5860 SCHEME_V->interactive_repl = 0; 6337 SCHEME_V->interactive_repl = 0;
… …
5867 SCHEME_V->interactive_repl = old_repl; 6344 SCHEME_V->interactive_repl = old_repl;
5868 restore_from_C_call (SCHEME_A); 6345 restore_from_C_call (SCHEME_A);
5869 return SCHEME_V->value; 6346 return SCHEME_V->value;
5870} 6347}
5871 6348
5872pointer 6349ecb_cold pointer
5873scheme_eval (SCHEME_P_ pointer obj) 6350scheme_eval (SCHEME_P_ pointer obj)
5874{ 6351{
5875 int old_repl = SCHEME_V->interactive_repl; 6352 int old_repl = SCHEME_V->interactive_repl;
5876 6353
5877 SCHEME_V->interactive_repl = 0; 6354 SCHEME_V->interactive_repl = 0;
… …
5889 6366
5890/* ========== Main ========== */ 6367/* ========== Main ========== */
5891 6368
5892#if STANDALONE 6369#if STANDALONE
5893 6370
5894int 6371ecb_cold int
5895main (int argc, char **argv) 6372main (int argc, char **argv)
5896{ 6373{
5897# if USE_MULTIPLICITY 6374# if USE_MULTIPLICITY
5898 scheme ssc; 6375 scheme ssc;
5899 scheme *const SCHEME_V = &ssc; 6376 scheme *const SCHEME_V = &ssc;
… …
5901# endif 6378# endif
5902 int fin; 6379 int fin;
5903 char *file_name = InitFile; 6380 char *file_name = InitFile;
5904 int retcode; 6381 int retcode;
5905 int isfile = 1; 6382 int isfile = 1;
6383#if EXPERIMENT
6384 system ("ps v $PPID");
6385#endif
5906 6386
5907 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6387 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5908 { 6388 {
5909 xwrstr ("Usage: tinyscheme -?\n"); 6389 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5910 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6390 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5911 xwrstr ("followed by\n"); 6391 putstr (SCHEME_A_ "followed by\n");
5912 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6392 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5913 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6393 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5914 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6394 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5915 xwrstr ("Use - as filename for stdin.\n"); 6395 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5916 return 1; 6396 return 1;
5917 } 6397 }
5918 6398
5919 if (!scheme_init (SCHEME_A)) 6399 if (!scheme_init (SCHEME_A))
5920 { 6400 {
5921 xwrstr ("Could not initialize!\n"); 6401 putstr (SCHEME_A_ "Could not initialize!\n");
5922 return 2; 6402 return 2;
5923 } 6403 }
5924 6404
5925# if USE_PORTS 6405# if USE_PORTS
5926 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6406 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
5939 } 6419 }
5940#endif 6420#endif
5941 6421
5942 do 6422 do
5943 { 6423 {
5944#if USE_PORTS
5945 if (strcmp (file_name, "-") == 0) 6424 if (strcmp (file_name, "-") == 0)
5946 fin = STDIN_FILENO; 6425 fin = STDIN_FILENO;
5947 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)
5948 { 6427 {
5949 pointer args = NIL; 6428 pointer args = NIL;
… …
5967 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);
5968 6447
5969 } 6448 }
5970 else 6449 else
5971 fin = open (file_name, O_RDONLY); 6450 fin = open (file_name, O_RDONLY);
5972#endif
5973 6451
5974 if (isfile && fin < 0) 6452 if (isfile && fin < 0)
5975 { 6453 {
5976 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');
5977 } 6457 }
5978 else 6458 else
5979 { 6459 {
5980 if (isfile) 6460 if (isfile)
5981 scheme_load_named_file (SCHEME_A_ fin, file_name); 6461 scheme_load_named_file (SCHEME_A_ fin, file_name);
5982 else 6462 else
5983 scheme_load_string (SCHEME_A_ file_name); 6463 scheme_load_string (SCHEME_A_ file_name);
5984 6464
5985#if USE_PORTS
5986 if (!isfile || fin != STDIN_FILENO) 6465 if (!isfile || fin != STDIN_FILENO)
5987 { 6466 {
5988 if (SCHEME_V->retcode != 0) 6467 if (SCHEME_V->retcode != 0)
5989 { 6468 {
5990 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');
5991 } 6472 }
5992 6473
5993 if (isfile) 6474 if (isfile)
5994 close (fin); 6475 close (fin);
5995 } 6476 }
5996#endif
5997 } 6477 }
5998 6478
5999 file_name = *argv++; 6479 file_name = *argv++;
6000 } 6480 }
6001 while (file_name != 0); 6481 while (file_name != 0);

Diff Legend

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