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.67 by root, Mon Dec 7 19:49:35 2015 UTC

… …
16 * (MINISCM) This is a revised and modified version by Akira KIDA. 16 * (MINISCM) This is a revised and modified version by Akira KIDA.
17 * (MINISCM) current version is 0.85k4 (15 May 1994) 17 * (MINISCM) current version is 0.85k4 (15 May 1994)
18 * 18 *
19 */ 19 */
20 20
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 21#define _POSIX_C_SOURCE 200201
22#include "malloc.c" 22#define _XOPEN_SOURCE 600
23#define _GNU_SOURCE 1 /* for malloc mremap */
23 24
24#define SCHEME_SOURCE 25#define SCHEME_SOURCE
25#include "scheme-private.h" 26#include "scheme-private.h"
26#ifndef WIN32 27#ifndef WIN32
27# include <unistd.h> 28# include <unistd.h>
28#endif 29#endif
29#if USE_MATH 30#if USE_MATH
30# include <math.h> 31# include <math.h>
31#endif 32#endif
32 33
34#define ECB_NO_THREADS 1
33#include "ecb.h" 35#include "ecb.h"
34 36
35#include <sys/types.h> 37#include <sys/types.h>
36#include <sys/stat.h> 38#include <sys/stat.h>
37#include <fcntl.h> 39#include <fcntl.h>
… …
45#include <string.h> 47#include <string.h>
46 48
47#include <limits.h> 49#include <limits.h>
48#include <inttypes.h> 50#include <inttypes.h>
49#include <float.h> 51#include <float.h>
50//#include <ctype.h> 52
53#if !USE_SYSTEM_MALLOC
54# define PAGE_SIZE 4096 /* does not work on sparc/alpha */
55# include "malloc.c"
56# define malloc(n) tiny_malloc (n)
57# define realloc(p,n) tiny_realloc (p, n)
58# define free(p) tiny_free (p)
59#endif
51 60
52#if '1' != '0' + 1 \ 61#if '1' != '0' + 1 \
53 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \ 62 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
54 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \ 63 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
55 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \ 64 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
… …
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 + 0)
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 anything, doesn't cost anything */
1261 set_ivalue (x, n); 1265 set_ivalue (x, n);
1262 1266
1267 *pp = x;
1268 }
1269
1263 return x; 1270 return *pp;
1264} 1271}
1265 1272
1266INTERFACE pointer 1273INTERFACE pointer
1267mk_real (SCHEME_P_ RVALUE n) 1274mk_real (SCHEME_P_ RVALUE n)
1268{ 1275{
1269#if USE_REAL 1276#if USE_REAL
1270 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1277 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1271 1278
1272 set_typeflag (x, (T_REAL | T_ATOM)); 1279 set_typeflag (x, T_REAL | T_ATOM);
1273 set_rvalue (x, n); 1280 set_rvalue (x, n);
1274 1281
1275 return x; 1282 return x;
1276#else 1283#else
1277 return mk_integer (SCHEME_A_ n); 1284 return mk_integer (SCHEME_A_ n);
… …
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)
… …
1513 return mk_character (SCHEME_A_ c); 1546 return mk_character (SCHEME_A_ c);
1514 } 1547 }
1515 else 1548 else
1516 { 1549 {
1517 /* identify base by string index */ 1550 /* identify base by string index */
1518 const char baseidx[17] = "ffbf" "ffff" "ofdf" "ffff" "x"; 1551 const char baseidx[18] = "ffbf" "ffff" "ofdf" "ffff" "x";
1519 char *base = strchr (baseidx, *name); 1552 char *base = strchr (baseidx, *name);
1520 1553
1521 if (base) 1554 if (base && *base)
1522 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx)); 1555 return mk_integer (SCHEME_A_ strtol (name + 1, 0, base - baseidx));
1523 1556
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)
… …
2624 } 2613 }
2625 else if (is_symbol (l)) 2614 else if (is_symbol (l))
2626 p = symname (l); 2615 p = symname (l);
2627 else if (is_proc (l)) 2616 else if (is_proc (l))
2628 { 2617 {
2618 p = (char *)procname (l); // ok with r7rs display, but not r7rs write
2619#if 0
2629#if USE_PRINTF 2620#if USE_PRINTF
2630 p = SCHEME_V->strbuff; 2621 p = SCHEME_V->strbuff;
2631 snprintf (p, STRBUFFSIZE, "#<%s PROCEDURE %ld>", procname (l), procnum (l)); 2622 snprintf (p, STRBUFFSIZE, " PROCEDURE %ld>", procname (l), procnum (l));
2632#else 2623#else
2633 p = "#<PROCEDURE>"; 2624 p = "#<PROCEDURE>";
2625#endif
2634#endif 2626#endif
2635 } 2627 }
2636 else if (is_macro (l)) 2628 else if (is_macro (l))
2637 p = "#<MACRO>"; 2629 p = "#<MACRO>";
2638 else if (is_closure (l)) 2630 else if (is_closure (l))
… …
2649#endif 2641#endif
2650 } 2642 }
2651 else if (is_continuation (l)) 2643 else if (is_continuation (l))
2652 p = "#<CONTINUATION>"; 2644 p = "#<CONTINUATION>";
2653 else 2645 else
2646 {
2647#if USE_PRINTF
2648 p = SCHEME_V->strbuff;
2649 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2650#else
2654 p = "#<ERROR>"; 2651 p = "#<ERROR>";
2652#endif
2653 }
2655 2654
2656 *pp = p; 2655 *pp = p;
2657 *plen = strlen (p); 2656 *plen = strlen (p);
2658} 2657}
2659 2658
… …
2691 return car (d); 2690 return car (d);
2692 2691
2693 p = cons (car (d), cdr (d)); 2692 p = cons (car (d), cdr (d));
2694 q = p; 2693 q = p;
2695 2694
2696 while (cdr (cdr (p)) != NIL) 2695 while (cddr (p) != NIL)
2697 { 2696 {
2698 d = cons (car (p), cdr (p)); 2697 d = cons (car (p), cdr (p));
2699 2698
2700 if (cdr (cdr (p)) != NIL) 2699 if (cddr (p) != NIL)
2701 p = cdr (d); 2700 p = cdr (d);
2702 } 2701 }
2703 2702
2704 set_cdr (p, car (cdr (p))); 2703 set_cdr (p, cadr (p));
2705 return q; 2704 return q;
2706} 2705}
2707 2706
2708/* reverse list -- produce new list */ 2707/* reverse list -- produce new list */
2709static pointer 2708ecb_hot static pointer
2710reverse (SCHEME_P_ pointer a) 2709reverse (SCHEME_P_ pointer a)
2711{ 2710{
2712 /* a must be checked by gc */ 2711 /* a must be checked by gc */
2713 pointer p = NIL; 2712 pointer p = NIL;
2714 2713
… …
2717 2716
2718 return p; 2717 return p;
2719} 2718}
2720 2719
2721/* reverse list --- in-place */ 2720/* reverse list --- in-place */
2722static pointer 2721ecb_hot static pointer
2723reverse_in_place (SCHEME_P_ pointer term, pointer list) 2722reverse_in_place (SCHEME_P_ pointer term, pointer list)
2724{ 2723{
2725 pointer result = term; 2724 pointer result = term;
2726 pointer p = list; 2725 pointer p = list;
2727 2726
… …
2735 2734
2736 return result; 2735 return result;
2737} 2736}
2738 2737
2739/* append list -- produce new list (in reverse order) */ 2738/* append list -- produce new list (in reverse order) */
2740static pointer 2739ecb_hot static pointer
2741revappend (SCHEME_P_ pointer a, pointer b) 2740revappend (SCHEME_P_ pointer a, pointer b)
2742{ 2741{
2743 pointer result = a; 2742 pointer result = a;
2744 pointer p = b; 2743 pointer p = b;
2745 2744
… …
2754 2753
2755 return S_F; /* signal an error */ 2754 return S_F; /* signal an error */
2756} 2755}
2757 2756
2758/* equivalence of atoms */ 2757/* equivalence of atoms */
2759int 2758ecb_hot int
2760eqv (pointer a, pointer b) 2759eqv (pointer a, pointer b)
2761{ 2760{
2762 if (is_string (a)) 2761 if (is_string (a))
2763 { 2762 {
2764 if (is_string (b)) 2763 if (is_string (b))
… …
2858 } 2857 }
2859 else 2858 else
2860 set_car (env, immutable_cons (slot, car (env))); 2859 set_car (env, immutable_cons (slot, car (env)));
2861} 2860}
2862 2861
2863static pointer 2862ecb_hot static pointer
2864find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2863find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2865{ 2864{
2866 pointer x, y; 2865 pointer x, y;
2867 2866
2868 for (x = env; x != NIL; x = cdr (x)) 2867 for (x = env; x != NIL; x = cdr (x))
… …
2889 return NIL; 2888 return NIL;
2890} 2889}
2891 2890
2892#else /* USE_ALIST_ENV */ 2891#else /* USE_ALIST_ENV */
2893 2892
2894ecb_inline void 2893static void
2895new_frame_in_env (SCHEME_P_ pointer old_env) 2894new_frame_in_env (SCHEME_P_ pointer old_env)
2896{ 2895{
2897 SCHEME_V->envir = immutable_cons (NIL, old_env); 2896 SCHEME_V->envir = immutable_cons (NIL, old_env);
2898 setenvironment (SCHEME_V->envir); 2897 setenvironment (SCHEME_V->envir);
2899} 2898}
2900 2899
2901ecb_inline void 2900static void
2902new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2901new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2903{ 2902{
2904 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2903 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2905} 2904}
2906 2905
2907static pointer 2906ecb_hot static pointer
2908find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2907find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2909{ 2908{
2910 pointer x, y; 2909 pointer x, y;
2911 2910
2912 for (x = env; x != NIL; x = cdr (x)) 2911 for (x = env; x != NIL; x = cdr (x))
… …
2926 return NIL; 2925 return NIL;
2927} 2926}
2928 2927
2929#endif /* USE_ALIST_ENV else */ 2928#endif /* USE_ALIST_ENV else */
2930 2929
2931ecb_inline void 2930static void
2932new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2931new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2933{ 2932{
2933 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2934 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2934 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2935} 2935}
2936 2936
2937ecb_inline void 2937static void
2938set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2938set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2939{ 2939{
2940 set_cdr (slot, value); 2940 set_cdr (slot, value);
2941} 2941}
2942 2942
2943ecb_inline pointer 2943static pointer
2944slot_value_in_env (pointer slot) 2944slot_value_in_env (pointer slot)
2945{ 2945{
2946 return cdr (slot); 2946 return cdr (slot);
2947} 2947}
2948 2948
2949/* ========== Evaluation Cycle ========== */ 2949/* ========== Evaluation Cycle ========== */
2950 2950
2951static int 2951ecb_cold static int
2952xError_1 (SCHEME_P_ const char *s, pointer a) 2952xError_1 (SCHEME_P_ const char *s, pointer a)
2953{ 2953{
2954#if USE_ERROR_HOOK
2955 pointer x;
2956 pointer hdl = SCHEME_V->ERROR_HOOK;
2957#endif
2958
2959#if USE_PRINTF 2954#if USE_PRINTF
2960#if SHOW_ERROR_LINE 2955#if SHOW_ERROR_LINE
2961 char sbuf[STRBUFFSIZE]; 2956 char sbuf[STRBUFFSIZE];
2962 2957
2963 /* make sure error is not in REPL */ 2958 /* make sure error is not in REPL */
… …
2978 } 2973 }
2979#endif 2974#endif
2980#endif 2975#endif
2981 2976
2982#if USE_ERROR_HOOK 2977#if USE_ERROR_HOOK
2983 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2978 pointer x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->ERROR_HOOK, 1);
2984 2979
2985 if (x != NIL) 2980 if (x != NIL)
2986 { 2981 {
2987 pointer code = a 2982 pointer code = a
2988 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2983 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3032 pointer code; 3027 pointer code;
3033}; 3028};
3034 3029
3035# define STACK_GROWTH 3 3030# define STACK_GROWTH 3
3036 3031
3037static void 3032ecb_hot static void
3038s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3033s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3039{ 3034{
3040 int nframes = (uintptr_t)SCHEME_V->dump; 3035 int nframes = (uintptr_t)SCHEME_V->dump;
3041 struct dump_stack_frame *next_frame; 3036 struct dump_stack_frame *next_frame;
3042 3037
3043 /* enough room for the next frame? */ 3038 /* enough room for the next frame? */
3044 if (nframes >= SCHEME_V->dump_size) 3039 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3045 { 3040 {
3046 SCHEME_V->dump_size += STACK_GROWTH; 3041 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); 3042 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3048 } 3043 }
3049 3044
… …
3055 next_frame->code = code; 3050 next_frame->code = code;
3056 3051
3057 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3052 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3058} 3053}
3059 3054
3060static int 3055static ecb_hot int
3061xs_return (SCHEME_P_ pointer a) 3056xs_return (SCHEME_P_ pointer a)
3062{ 3057{
3063 int nframes = (uintptr_t)SCHEME_V->dump; 3058 int nframes = (uintptr_t)SCHEME_V->dump;
3064 struct dump_stack_frame *frame; 3059 struct dump_stack_frame *frame;
3065 3060
… …
3076 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3071 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3077 3072
3078 return 0; 3073 return 0;
3079} 3074}
3080 3075
3081ecb_inline void 3076ecb_cold void
3082dump_stack_reset (SCHEME_P) 3077dump_stack_reset (SCHEME_P)
3083{ 3078{
3084 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3079 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3085 SCHEME_V->dump = (pointer)+0; 3080 SCHEME_V->dump = (pointer)+0;
3086} 3081}
3087 3082
3088ecb_inline void 3083ecb_cold void
3089dump_stack_initialize (SCHEME_P) 3084dump_stack_initialize (SCHEME_P)
3090{ 3085{
3091 SCHEME_V->dump_size = 0; 3086 SCHEME_V->dump_size = 0;
3092 SCHEME_V->dump_base = 0; 3087 SCHEME_V->dump_base = 0;
3093 dump_stack_reset (SCHEME_A); 3088 dump_stack_reset (SCHEME_A);
3094} 3089}
3095 3090
3096static void 3091ecb_cold static void
3097dump_stack_free (SCHEME_P) 3092dump_stack_free (SCHEME_P)
3098{ 3093{
3099 free (SCHEME_V->dump_base); 3094 free (SCHEME_V->dump_base);
3100 SCHEME_V->dump_base = 0; 3095 SCHEME_V->dump_base = 0;
3101 SCHEME_V->dump = (pointer)0; 3096 SCHEME_V->dump = (pointer)0;
3102 SCHEME_V->dump_size = 0; 3097 SCHEME_V->dump_size = 0;
3103} 3098}
3104 3099
3105static void 3100ecb_cold static void
3106dump_stack_mark (SCHEME_P) 3101dump_stack_mark (SCHEME_P)
3107{ 3102{
3108 int nframes = (uintptr_t)SCHEME_V->dump; 3103 int nframes = (uintptr_t)SCHEME_V->dump;
3109 int i; 3104 int i;
3110 3105
… …
3116 mark (frame->envir); 3111 mark (frame->envir);
3117 mark (frame->code); 3112 mark (frame->code);
3118 } 3113 }
3119} 3114}
3120 3115
3121static pointer 3116ecb_cold static pointer
3122ss_get_cont (SCHEME_P) 3117ss_get_cont (SCHEME_P)
3123{ 3118{
3124 int nframes = (uintptr_t)SCHEME_V->dump; 3119 int nframes = (uintptr_t)SCHEME_V->dump;
3125 int i; 3120 int i;
3126 3121
… …
3138 } 3133 }
3139 3134
3140 return cont; 3135 return cont;
3141} 3136}
3142 3137
3143static void 3138ecb_cold static void
3144ss_set_cont (SCHEME_P_ pointer cont) 3139ss_set_cont (SCHEME_P_ pointer cont)
3145{ 3140{
3146 int i = 0; 3141 int i = 0;
3147 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3142 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3148 3143
… …
3160 SCHEME_V->dump = (pointer)(uintptr_t)i; 3155 SCHEME_V->dump = (pointer)(uintptr_t)i;
3161} 3156}
3162 3157
3163#else 3158#else
3164 3159
3165ecb_inline void 3160ecb_cold void
3166dump_stack_reset (SCHEME_P) 3161dump_stack_reset (SCHEME_P)
3167{ 3162{
3168 SCHEME_V->dump = NIL; 3163 SCHEME_V->dump = NIL;
3169} 3164}
3170 3165
3171ecb_inline void 3166ecb_cold void
3172dump_stack_initialize (SCHEME_P) 3167dump_stack_initialize (SCHEME_P)
3173{ 3168{
3174 dump_stack_reset (SCHEME_A); 3169 dump_stack_reset (SCHEME_A);
3175} 3170}
3176 3171
3177static void 3172ecb_cold static void
3178dump_stack_free (SCHEME_P) 3173dump_stack_free (SCHEME_P)
3179{ 3174{
3180 SCHEME_V->dump = NIL; 3175 SCHEME_V->dump = NIL;
3181} 3176}
3182 3177
3183static int 3178ecb_hot static int
3184xs_return (SCHEME_P_ pointer a) 3179xs_return (SCHEME_P_ pointer a)
3185{ 3180{
3186 pointer dump = SCHEME_V->dump; 3181 pointer dump = SCHEME_V->dump;
3187 3182
3188 SCHEME_V->value = a; 3183 SCHEME_V->value = a;
… …
3198 SCHEME_V->dump = dump; 3193 SCHEME_V->dump = dump;
3199 3194
3200 return 0; 3195 return 0;
3201} 3196}
3202 3197
3203static void 3198ecb_hot static void
3204s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3199s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3205{ 3200{
3206 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3201 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3207 cons (args, 3202 cons (args,
3208 cons (SCHEME_V->envir, 3203 cons (SCHEME_V->envir,
3209 cons (code, 3204 cons (code,
3210 SCHEME_V->dump)))); 3205 SCHEME_V->dump))));
3211} 3206}
3212 3207
3208ecb_cold static void
3209dump_stack_mark (SCHEME_P)
3210{
3211 mark (SCHEME_V->dump);
3212}
3213
3214ecb_cold static pointer
3215ss_get_cont (SCHEME_P)
3216{
3217 return SCHEME_V->dump;
3218}
3219
3220ecb_cold static void
3221ss_set_cont (SCHEME_P_ pointer cont)
3222{
3223 SCHEME_V->dump = cont;
3224}
3225
3226#endif
3227
3228#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3229
3230#if EXPERIMENT
3231
3232static int
3233dtree (SCHEME_P_ int indent, pointer x)
3234{
3235 int c;
3236
3237 if (is_syntax (x))
3238 {
3239 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3240 return 8 + 8;
3241 }
3242
3243 if (x == NIL)
3244 {
3245 printf ("%*sNIL\n", indent, "");
3246 return 3;
3247 }
3248
3249 switch (type (x))
3250 {
3251 case T_INTEGER:
3252 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3253 return 32+8;
3254
3255 case T_SYMBOL:
3256 printf ("%*sS<%s>\n", indent, "", symname (x));
3257 return 24+8;
3258
3259 case T_CLOSURE:
3260 printf ("%*sS<%s>\n", indent, "", "closure");
3261 dtree (SCHEME_A_ indent + 3, cdr(x));
3262 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3263
3264 case T_PAIR:
3265 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3266 c = dtree (SCHEME_A_ indent + 3, car (x));
3267 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3268 return c + 1;
3269
3270 case T_PORT:
3271 printf ("%*sS<%s>\n", indent, "", "port");
3272 return 24+8;
3273
3274 case T_VECTOR:
3275 printf ("%*sS<%s>\n", indent, "", "vector");
3276 return 24+8;
3277
3278 case T_ENVIRONMENT:
3279 printf ("%*sS<%s>\n", indent, "", "environment");
3280 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3281
3282 default:
3283 printf ("unhandled type %d\n", type (x));
3284 break;
3285 }
3286}
3287
3288#define DUMP(t) do { printf ("DUMP %s:%d\n", __FILE__, __LINE__); dtree (SCHEME_A_ 0, (t)); } while (0)
3289
3290typedef void *stream[1];
3291
3292#define stream_init() { 0 }
3293#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3294#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3295#define stream_free(s) free (s[0])
3296
3297ecb_cold static void
3298stream_put (stream s, uint8_t byte)
3299{
3300 uint32_t *sp = *s;
3301 uint32_t size = sizeof (uint32_t) * 2;
3302 uint32_t offs = size;
3303
3304 if (ecb_expect_true (sp))
3305 {
3306 offs = sp[0];
3307 size = sp[1];
3308 }
3309
3310 if (ecb_expect_false (offs == size))
3311 {
3312 size *= 2;
3313 sp = realloc (sp, size);
3314 *s = sp;
3315 sp[1] = size;
3316
3317 }
3318
3319 ((uint8_t *)sp)[offs++] = byte;
3320 sp[0] = offs;
3321}
3322
3323ecb_cold static void
3324stream_put_v (stream s, uint32_t v)
3325{
3326 while (v > 0x7f)
3327 {
3328 stream_put (s, v | 0x80);
3329 v >>= 7;
3330 }
3331
3332 stream_put (s, v);
3333}
3334
3335ecb_cold static void
3336stream_put_tv (stream s, int bop, uint32_t v)
3337{
3338 printf ("put tv %d %d\n", bop, v);//D
3339 stream_put (s, bop);
3340 stream_put_v (s, v);
3341}
3342
3343ecb_cold static void
3344stream_put_stream (stream s, stream o)
3345{
3346 uint32_t i;
3347
3348 for (i = 0; i < stream_size (o); ++i)
3349 stream_put (s, stream_data (o)[i]);
3350
3351 stream_free (o);
3352}
3353
3354ecb_cold static uint32_t
3355cell_id (SCHEME_P_ pointer x)
3356{
3357 struct cell *p = CELL (x);
3358 int i;
3359
3360 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3361 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3362 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3363
3364 abort ();
3365}
3366
3367// calculates a (preferably small) integer that makes it possible to find
3368// the symbol again. if pointers were offsets into a memory area... until
3369// then, we return segment number in the low bits, and offset in the high
3370// bits.
3371// also, this function must never return 0.
3372ecb_cold static uint32_t
3373symbol_id (SCHEME_P_ pointer sym)
3374{
3375 return cell_id (SCHEME_A_ sym);
3376}
3377
3378enum byteop
3379{
3380 BOP_NIL,
3381 BOP_INTEGER,
3382 BOP_SYMBOL,
3383 BOP_DATUM,
3384 BOP_LIST_BEG,
3385 BOP_LIST_END,
3386 BOP_IF,
3387 BOP_AND,
3388 BOP_OR,
3389 BOP_CASE,
3390 BOP_COND,
3391 BOP_LET,
3392 BOP_LETAST,
3393 BOP_LETREC,
3394 BOP_DEFINE,
3395 BOP_MACRO,
3396 BOP_SET,
3397 BOP_BEGIN,
3398 BOP_LAMBDA,
3399 BOP_OP,
3400};
3401
3402ecb_cold static void compile_expr (SCHEME_P_ stream s, pointer x);
3403
3404ecb_cold static void
3405compile_list (SCHEME_P_ stream s, pointer x)
3406{
3407 // TODO: improper list
3408
3409 for (; x != NIL; x = cdr (x))
3410 {
3411 stream t = stream_init ();
3412 compile_expr (SCHEME_A_ t, car (x));
3413 stream_put_v (s, stream_size (t));
3414 stream_put_stream (s, t);
3415 }
3416
3417 stream_put_v (s, 0);
3418}
3419
3213static void 3420static void
3214dump_stack_mark (SCHEME_P) 3421compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3215{ 3422{
3216 mark (SCHEME_V->dump); 3423 stream sift = stream_init (); compile_expr (SCHEME_A_ sift, ift);
3424
3425 stream_put (s, BOP_IF);
3426 compile_expr (SCHEME_A_ s, cond);
3427 stream_put_v (s, stream_size (sift));
3428 stream_put_stream (s, sift);
3429 compile_expr (SCHEME_A_ s, iff);
3430}
3431
3432typedef uint32_t stream_fixup;
3433
3434static stream_fixup
3435stream_put_fixup (stream s)
3436{
3437 stream_put (s, 0);
3438 stream_put (s, 0);
3439
3440 return stream_size (s);
3441}
3442
3443static void
3444stream_fix_fixup (stream s, stream_fixup fixup, uint32_t target)
3445{
3446 target -= fixup;
3447 assert (target < (1 << 14));
3448 stream_data (s)[fixup - 2] = target | 0x80;
3449 stream_data (s)[fixup - 1] = target >> 7;
3450}
3451
3452static void
3453compile_and_or (SCHEME_P_ stream s, int and, pointer x)
3454{
3455 for (; cdr (x) != NIL; x = cdr (x))
3456 {
3457 stream t = stream_init ();
3458 compile_expr (SCHEME_A_ t, car (x));
3459 stream_put_v (s, stream_size (t));
3460 stream_put_stream (s, t);
3461 }
3462
3463 stream_put_v (s, 0);
3464}
3465
3466static void
3467compile_case (SCHEME_P_ stream s, pointer x)
3468{
3469 compile_expr (SCHEME_A_ s, caar (x));
3470
3471 for (;;)
3472 {
3473 x = cdr (x);
3474
3475 if (x == NIL)
3476 break;
3477
3478 compile_expr (SCHEME_A_ s, caar (x));
3479 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3480 stream_put_v (s, stream_size (t));
3481 stream_put_stream (s, t);
3482 }
3483
3484 stream_put_v (s, 0);
3485}
3486
3487static void
3488compile_cond (SCHEME_P_ stream s, pointer x)
3489{
3490 for ( ; x != NIL; x = cdr (x))
3491 {
3492 compile_expr (SCHEME_A_ s, caar (x));
3493 stream t = stream_init (); compile_expr (SCHEME_A_ t, cdar (x));
3494 stream_put_v (s, stream_size (t));
3495 stream_put_stream (s, t);
3496 }
3497
3498 stream_put_v (s, 0);
3217} 3499}
3218 3500
3219static pointer 3501static pointer
3220ss_get_cont (SCHEME_P) 3502lookup (SCHEME_P_ pointer x)
3221{ 3503{
3222 return SCHEME_V->dump; 3504 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, x, 1);
3223}
3224 3505
3225static void 3506 if (x != NIL)
3226ss_set_cont (SCHEME_P_ pointer cont) 3507 x = slot_value_in_env (x);
3227{
3228 SCHEME_V->dump = cont;
3229}
3230 3508
3231#endif 3509 return x;
3510}
3232 3511
3233#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3512ecb_cold static void
3513compile_expr (SCHEME_P_ stream s, pointer x)
3514{
3515 if (x == NIL)
3516 {
3517 stream_put (s, BOP_NIL);
3518 return;
3519 }
3234 3520
3235static int 3521 if (is_pair (x))
3522 {
3523 pointer head = car (x);
3524
3525 if (is_syntax (head))
3526 {
3527 x = cdr (x);
3528
3529 switch (syntaxnum (head))
3530 {
3531 case OP_IF0: /* if */
3532 stream_put_v (s, BOP_IF);
3533 compile_if (SCHEME_A_ s, car (x), cadr (x), caddr (x));
3534 break;
3535
3536 case OP_OR0: /* or */
3537 stream_put_v (s, BOP_OR);
3538 compile_and_or (SCHEME_A_ s, 0, x);
3539 break;
3540
3541 case OP_AND0: /* and */
3542 stream_put_v (s, BOP_AND);
3543 compile_and_or (SCHEME_A_ s, 1, x);
3544 break;
3545
3546 case OP_CASE0: /* case */
3547 stream_put_v (s, BOP_CASE);
3548 compile_case (SCHEME_A_ s, x);
3549 break;
3550
3551 case OP_COND0: /* cond */
3552 stream_put_v (s, BOP_COND);
3553 compile_cond (SCHEME_A_ s, x);
3554 break;
3555
3556 case OP_LET0: /* let */
3557 case OP_LET0AST: /* let* */
3558 case OP_LET0REC: /* letrec */
3559 switch (syntaxnum (head))
3560 {
3561 case OP_LET0: stream_put (s, BOP_LET ); break;
3562 case OP_LET0AST: stream_put (s, BOP_LETAST); break;
3563 case OP_LET0REC: stream_put (s, BOP_LETREC); break;
3564 }
3565
3566 {
3567 pointer bindings = car (x);
3568 pointer body = cadr (x);
3569
3570 for (x = bindings; x != NIL; x = cdr (x))
3571 {
3572 pointer init = NIL;
3573 pointer var = car (x);
3574
3575 if (is_pair (var))
3576 {
3577 init = cdr (var);
3578 var = car (var);
3579 }
3580
3581 stream_put_v (s, symbol_id (SCHEME_A_ var));
3582 compile_expr (SCHEME_A_ s, init);
3583 }
3584
3585 stream_put_v (s, 0);
3586 compile_expr (SCHEME_A_ s, body);
3587 }
3588 break;
3589
3590 case OP_DEF0: /* define */
3591 case OP_MACRO0: /* macro */
3592 stream_put (s, syntaxnum (head) == OP_DEF0 ? BOP_DEFINE : BOP_MACRO);
3593 stream_put_v (s, cell_id (SCHEME_A_ car (x)));
3594 compile_expr (SCHEME_A_ s, cadr (x));
3595 break;
3596
3597 case OP_SET0: /* set! */
3598 stream_put (s, BOP_SET);
3599 stream_put_v (s, symbol_id (SCHEME_A_ car (x)));
3600 compile_expr (SCHEME_A_ s, cadr (x));
3601 break;
3602
3603 case OP_BEGIN: /* begin */
3604 stream_put (s, BOP_BEGIN);
3605 compile_list (SCHEME_A_ s, x);
3606 return;
3607
3608 case OP_DELAY: /* delay */
3609 abort ();
3610 break;
3611
3612 case OP_QUOTE: /* quote */
3613 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3614 break;
3615
3616 case OP_LAMBDA: /* lambda */
3617 {
3618 pointer formals = car (x);
3619 pointer body = cadr (x);
3620
3621 stream_put (s, BOP_LAMBDA);
3622
3623 for (; is_pair (formals); formals = cdr (formals))
3624 stream_put_v (s, symbol_id (SCHEME_A_ car (formals)));
3625
3626 stream_put_v (s, 0);
3627 stream_put_v (s, formals == NIL ? 0 : symbol_id (SCHEME_A_ formals));
3628
3629 compile_expr (SCHEME_A_ s, body);
3630 }
3631 break;
3632
3633 case OP_C0STREAM:/* cons-stream */
3634 abort ();
3635 break;
3636 }
3637
3638 return;
3639 }
3640
3641 pointer m = lookup (SCHEME_A_ head);
3642
3643 if (is_macro (m))
3644 {
3645 s_save (SCHEME_A_ OP_DEBUG2, SCHEME_V->args, SCHEME_V->code);
3646 SCHEME_V->code = m;
3647 SCHEME_V->args = cons (x, NIL);
3648 Eval_Cycle (SCHEME_A_ OP_APPLY);
3649 x = SCHEME_V->value;
3650 compile_expr (SCHEME_A_ s, SCHEME_V->value);
3651 return;
3652 }
3653
3654 stream_put (s, BOP_LIST_BEG);
3655
3656 for (; x != NIL; x = cdr (x))
3657 compile_expr (SCHEME_A_ s, car (x));
3658
3659 stream_put (s, BOP_LIST_END);
3660 return;
3661 }
3662
3663 switch (type (x))
3664 {
3665 case T_INTEGER:
3666 {
3667 IVALUE iv = ivalue_unchecked (x);
3668 iv = iv < 0 ? ((~(uint32_t)iv) << 1) | 1 : (uint32_t)iv << 1;
3669 stream_put_tv (s, BOP_INTEGER, iv);
3670 }
3671 return;
3672
3673 case T_SYMBOL:
3674 if (0)
3675 {
3676 // no can do without more analysis
3677 pointer m = lookup (SCHEME_A_ x);
3678
3679 if (is_proc (m))
3680 {
3681 printf ("compile proc %s %d\n", procname(m), procnum(m));
3682 stream_put_tv (s, BOP_SYMBOL, BOP_OP + procnum (m));
3683 }
3684 else
3685 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3686 }
3687
3688 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3689 return;
3690
3691 default:
3692 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3693 break;
3694 }
3695}
3696
3697ecb_cold static int
3698compile_closure (SCHEME_P_ pointer p)
3699{
3700 stream s = stream_init ();
3701
3702 compile_list (SCHEME_A_ s, cdar (p));
3703
3704 FILE *xxd = popen ("xxd", "we");
3705 fwrite (stream_data (s), 1, stream_size (s), xxd);
3706 fclose (xxd);
3707
3708 return stream_size (s);
3709}
3710
3711#endif
3712
3713/* syntax, eval, core, ... */
3714ecb_hot static int
3236opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3715opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3237{ 3716{
3238 pointer args = SCHEME_V->args; 3717 pointer args = SCHEME_V->args;
3239 pointer x, y; 3718 pointer x, y;
3240 3719
3241 switch (op) 3720 switch (op)
3242 { 3721 {
3722#if EXPERIMENT //D
3723 case OP_DEBUG:
3724 {
3725 uint32_t len = compile_closure (SCHEME_A_ car (args));
3726 printf ("len = %d\n", len);
3727 printf ("\n");
3728 s_return (S_T);
3729 }
3730
3731 case OP_DEBUG2:
3732 return -1;
3733#endif
3734
3243 case OP_LOAD: /* load */ 3735 case OP_LOAD: /* load */
3244 if (file_interactive (SCHEME_A)) 3736 if (file_interactive (SCHEME_A))
3245 { 3737 {
3246 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3738 putstr (SCHEME_A_ "Loading ");
3247 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3739 putstr (SCHEME_A_ strvalue (car (args)));
3740 putcharacter (SCHEME_A_ '\n');
3248 } 3741 }
3249 3742
3250 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3743 if (!file_push (SCHEME_A_ strvalue (car (args))))
3251 Error_1 ("unable to open", car (args)); 3744 Error_1 ("unable to open", car (args));
3252 else 3745
3253 {
3254 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3746 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3255 s_goto (OP_T0LVL); 3747 s_goto (OP_T0LVL);
3256 }
3257 3748
3258 case OP_T0LVL: /* top level */ 3749 case OP_T0LVL: /* top level */
3259 3750
3260 /* If we reached the end of file, this loop is done. */ 3751 /* If we reached the end of file, this loop is done. */
3261 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3752 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3262 { 3753 {
3263 if (SCHEME_V->file_i == 0) 3754 if (SCHEME_V->file_i == 0)
3264 { 3755 {
3265 SCHEME_V->args = NIL; 3756 SCHEME_V->args = NIL;
3266 s_goto (OP_QUIT); 3757 s_goto (OP_QUIT);
… …
3277 /* If interactive, be nice to user. */ 3768 /* If interactive, be nice to user. */
3278 if (file_interactive (SCHEME_A)) 3769 if (file_interactive (SCHEME_A))
3279 { 3770 {
3280 SCHEME_V->envir = SCHEME_V->global_env; 3771 SCHEME_V->envir = SCHEME_V->global_env;
3281 dump_stack_reset (SCHEME_A); 3772 dump_stack_reset (SCHEME_A);
3282 putstr (SCHEME_A_ "\n"); 3773 putcharacter (SCHEME_A_ '\n');
3774#if EXPERIMENT
3775 system ("ps v $PPID");
3776#endif
3283 putstr (SCHEME_A_ prompt); 3777 putstr (SCHEME_A_ prompt);
3284 } 3778 }
3285 3779
3286 /* Set up another iteration of REPL */ 3780 /* Set up another iteration of REPL */
3287 SCHEME_V->nesting = 0; 3781 SCHEME_V->nesting = 0;
… …
3322 { 3816 {
3323 SCHEME_V->print_flag = 1; 3817 SCHEME_V->print_flag = 1;
3324 SCHEME_V->args = SCHEME_V->value; 3818 SCHEME_V->args = SCHEME_V->value;
3325 s_goto (OP_P0LIST); 3819 s_goto (OP_P0LIST);
3326 } 3820 }
3327 else 3821
3328 s_return (SCHEME_V->value); 3822 s_return (SCHEME_V->value);
3329 3823
3330 case OP_EVAL: /* main part of evaluation */ 3824 case OP_EVAL: /* main part of evaluation */
3331#if USE_TRACING 3825#if USE_TRACING
3332 if (SCHEME_V->tracing) 3826 if (SCHEME_V->tracing)
3333 { 3827 {
… …
3344#endif 3838#endif
3345 if (is_symbol (SCHEME_V->code)) /* symbol */ 3839 if (is_symbol (SCHEME_V->code)) /* symbol */
3346 { 3840 {
3347 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3841 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3348 3842
3349 if (x != NIL) 3843 if (x == NIL)
3350 s_return (slot_value_in_env (x));
3351 else
3352 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3844 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3845
3846 s_return (slot_value_in_env (x));
3353 } 3847 }
3354 else if (is_pair (SCHEME_V->code)) 3848 else if (is_pair (SCHEME_V->code))
3355 { 3849 {
3356 x = car (SCHEME_V->code); 3850 x = car (SCHEME_V->code);
3357 3851
… …
3366 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3860 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3367 SCHEME_V->code = x; 3861 SCHEME_V->code = x;
3368 s_goto (OP_EVAL); 3862 s_goto (OP_EVAL);
3369 } 3863 }
3370 } 3864 }
3371 else 3865
3372 s_return (SCHEME_V->code); 3866 s_return (SCHEME_V->code);
3373 3867
3374 case OP_E0ARGS: /* eval arguments */ 3868 case OP_E0ARGS: /* eval arguments */
3375 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3869 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3376 { 3870 {
3377 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3871 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3378 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3872 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3379 SCHEME_V->code = SCHEME_V->value; 3873 SCHEME_V->code = SCHEME_V->value;
3380 s_goto (OP_APPLY); 3874 s_goto (OP_APPLY);
3381 } 3875 }
3382 else 3876
3383 {
3384 SCHEME_V->code = cdr (SCHEME_V->code); 3877 SCHEME_V->code = cdr (SCHEME_V->code);
3385 s_goto (OP_E1ARGS); 3878 s_goto (OP_E1ARGS);
3386 }
3387 3879
3388 case OP_E1ARGS: /* eval arguments */ 3880 case OP_E1ARGS: /* eval arguments */
3389 args = cons (SCHEME_V->value, args); 3881 args = cons (SCHEME_V->value, args);
3390 3882
3391 if (is_pair (SCHEME_V->code)) /* continue */ 3883 if (is_pair (SCHEME_V->code)) /* continue */
… …
3402 SCHEME_V->args = cdr (args); 3894 SCHEME_V->args = cdr (args);
3403 s_goto (OP_APPLY); 3895 s_goto (OP_APPLY);
3404 } 3896 }
3405 3897
3406#if USE_TRACING 3898#if USE_TRACING
3407
3408 case OP_TRACING: 3899 case OP_TRACING:
3409 { 3900 {
3410 int tr = SCHEME_V->tracing; 3901 int tr = SCHEME_V->tracing;
3411 3902
3412 SCHEME_V->tracing = ivalue_unchecked (car (args)); 3903 SCHEME_V->tracing = ivalue_unchecked (car (args));
3413 s_return (mk_integer (SCHEME_A_ tr)); 3904 s_return (mk_integer (SCHEME_A_ tr));
3414 } 3905 }
3415
3416#endif 3906#endif
3417 3907
3418 case OP_APPLY: /* apply 'code' to 'args' */ 3908 case OP_APPLY: /* apply 'code' to 'args' */
3419#if USE_TRACING 3909#if USE_TRACING
3420 if (SCHEME_V->tracing) 3910 if (SCHEME_V->tracing)
… …
3434 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3924 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3435 else if (is_foreign (SCHEME_V->code)) 3925 else if (is_foreign (SCHEME_V->code))
3436 { 3926 {
3437 /* Keep nested calls from GC'ing the arglist */ 3927 /* Keep nested calls from GC'ing the arglist */
3438 push_recent_alloc (SCHEME_A_ args, NIL); 3928 push_recent_alloc (SCHEME_A_ args, NIL);
3439 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3929 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3440 3930
3441 s_return (x); 3931 s_return (x);
3442 } 3932 }
3443 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3933 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3444 { 3934 {
… …
3474 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3964 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3475 { 3965 {
3476 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3966 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3477 s_return (args != NIL ? car (args) : NIL); 3967 s_return (args != NIL ? car (args) : NIL);
3478 } 3968 }
3479 else 3969
3480 Error_0 ("illegal function"); 3970 Error_0 ("illegal function");
3481 3971
3482 case OP_DOMACRO: /* do macro */ 3972 case OP_DOMACRO: /* do macro */
3483 SCHEME_V->code = SCHEME_V->value; 3973 SCHEME_V->code = SCHEME_V->value;
3484 s_goto (OP_EVAL); 3974 s_goto (OP_EVAL);
3485
3486#if 1
3487 3975
3488 case OP_LAMBDA: /* lambda */ 3976 case OP_LAMBDA: /* lambda */
3489 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3977 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3490 set SCHEME_V->value fall thru */ 3978 set SCHEME_V->value fall thru */
3491 { 3979 {
… …
3498 SCHEME_V->code = slot_value_in_env (f); 3986 SCHEME_V->code = slot_value_in_env (f);
3499 s_goto (OP_APPLY); 3987 s_goto (OP_APPLY);
3500 } 3988 }
3501 3989
3502 SCHEME_V->value = SCHEME_V->code; 3990 SCHEME_V->value = SCHEME_V->code;
3503 /* Fallthru */
3504 } 3991 }
3992 /* Fallthru */
3505 3993
3506 case OP_LAMBDA1: 3994 case OP_LAMBDA1:
3507 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3995 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
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 3996
3516 case OP_MKCLOSURE: /* make-closure */ 3997 case OP_MKCLOSURE: /* make-closure */
3517 x = car (args); 3998 x = car (args);
3518 3999
3519 if (car (x) == SCHEME_V->LAMBDA) 4000 if (car (x) == SCHEME_V->LAMBDA)
… …
3558 else 4039 else
3559 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 4040 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3560 4041
3561 s_return (SCHEME_V->code); 4042 s_return (SCHEME_V->code);
3562 4043
3563
3564 case OP_DEFP: /* defined? */ 4044 case OP_DEFP: /* defined? */
3565 x = SCHEME_V->envir; 4045 x = SCHEME_V->envir;
3566 4046
3567 if (cdr (args) != NIL) 4047 if (cdr (args) != NIL)
3568 x = cadr (args); 4048 x = cadr (args);
… …
3586 s_return (SCHEME_V->value); 4066 s_return (SCHEME_V->value);
3587 } 4067 }
3588 else 4068 else
3589 Error_1 ("set!: unbound variable:", SCHEME_V->code); 4069 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3590 4070
3591
3592 case OP_BEGIN: /* begin */ 4071 case OP_BEGIN: /* begin */
3593 if (!is_pair (SCHEME_V->code)) 4072 if (!is_pair (SCHEME_V->code))
3594 s_return (SCHEME_V->code); 4073 s_return (SCHEME_V->code);
3595 4074
3596 if (cdr (SCHEME_V->code) != NIL) 4075 if (cdr (SCHEME_V->code) != NIL)
… …
3607 case OP_IF1: /* if */ 4086 case OP_IF1: /* if */
3608 if (is_true (SCHEME_V->value)) 4087 if (is_true (SCHEME_V->value))
3609 SCHEME_V->code = car (SCHEME_V->code); 4088 SCHEME_V->code = car (SCHEME_V->code);
3610 else 4089 else
3611 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 4090 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
4091
3612 s_goto (OP_EVAL); 4092 s_goto (OP_EVAL);
3613 4093
3614 case OP_LET0: /* let */ 4094 case OP_LET0: /* let */
3615 SCHEME_V->args = NIL; 4095 SCHEME_V->args = NIL;
3616 SCHEME_V->value = SCHEME_V->code; 4096 SCHEME_V->value = SCHEME_V->code;
3617 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 4097 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3618 s_goto (OP_LET1); 4098 s_goto (OP_LET1);
3619 4099
3620 case OP_LET1: /* let (calculate parameters) */ 4100 case OP_LET1: /* let (calculate parameters) */
4101 case OP_LET1REC: /* letrec (calculate parameters) */
3621 args = cons (SCHEME_V->value, args); 4102 args = cons (SCHEME_V->value, args);
3622 4103
3623 if (is_pair (SCHEME_V->code)) /* continue */ 4104 if (is_pair (SCHEME_V->code)) /* continue */
3624 { 4105 {
3625 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 4106 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3626 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 4107 Error_1 ("Bad syntax of binding spec in let/letrec:", car (SCHEME_V->code));
3627 4108
3628 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4109 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3629 SCHEME_V->code = cadar (SCHEME_V->code); 4110 SCHEME_V->code = cadar (SCHEME_V->code);
3630 SCHEME_V->args = NIL; 4111 SCHEME_V->args = NIL;
3631 s_goto (OP_EVAL); 4112 s_goto (OP_EVAL);
3632 } 4113 }
3633 else /* end */ 4114
3634 { 4115 /* end */
3635 args = reverse_in_place (SCHEME_A_ NIL, args); 4116 args = reverse_in_place (SCHEME_A_ NIL, args);
3636 SCHEME_V->code = car (args); 4117 SCHEME_V->code = car (args);
3637 SCHEME_V->args = cdr (args); 4118 SCHEME_V->args = cdr (args);
3638 s_goto (OP_LET2); 4119 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3639 }
3640 4120
3641 case OP_LET2: /* let */ 4121 case OP_LET2: /* let */
3642 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4122 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3643 4123
3644 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args; 4124 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
… …
3648 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4128 if (is_symbol (car (SCHEME_V->code))) /* named let */
3649 { 4129 {
3650 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x)) 4130 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3651 { 4131 {
3652 if (!is_pair (x)) 4132 if (!is_pair (x))
3653 Error_1 ("Bad syntax of binding in let :", x); 4133 Error_1 ("Bad syntax of binding in let:", x);
3654 4134
3655 if (!is_list (SCHEME_A_ car (x))) 4135 if (!is_list (SCHEME_A_ car (x)))
3656 Error_1 ("Bad syntax of binding in let :", car (x)); 4136 Error_1 ("Bad syntax of binding in let:", car (x));
3657 4137
3658 args = cons (caar (x), args); 4138 args = cons (caar (x), args);
3659 } 4139 }
3660 4140
3661 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)), 4141 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
… …
3678 SCHEME_V->code = cdr (SCHEME_V->code); 4158 SCHEME_V->code = cdr (SCHEME_V->code);
3679 s_goto (OP_BEGIN); 4159 s_goto (OP_BEGIN);
3680 } 4160 }
3681 4161
3682 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code))) 4162 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code)))
3683 Error_1 ("Bad syntax of binding spec in let* :", car (SCHEME_V->code)); 4163 Error_1 ("Bad syntax of binding spec in let*:", car (SCHEME_V->code));
3684 4164
3685 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code)); 4165 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code));
3686 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4166 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3687 s_goto (OP_EVAL); 4167 s_goto (OP_EVAL);
3688 4168
… …
3699 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4179 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3700 SCHEME_V->code = cadar (SCHEME_V->code); 4180 SCHEME_V->code = cadar (SCHEME_V->code);
3701 SCHEME_V->args = NIL; 4181 SCHEME_V->args = NIL;
3702 s_goto (OP_EVAL); 4182 s_goto (OP_EVAL);
3703 } 4183 }
3704 else /* end */ 4184
4185 /* end */
3705 { 4186
3706 SCHEME_V->code = args; 4187 SCHEME_V->code = args;
3707 SCHEME_V->args = NIL; 4188 SCHEME_V->args = NIL;
3708 s_goto (OP_BEGIN); 4189 s_goto (OP_BEGIN);
3709 }
3710 4190
3711 case OP_LET0REC: /* letrec */ 4191 case OP_LET0REC: /* letrec */
3712 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4192 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3713 SCHEME_V->args = NIL; 4193 SCHEME_V->args = NIL;
3714 SCHEME_V->value = SCHEME_V->code; 4194 SCHEME_V->value = SCHEME_V->code;
3715 SCHEME_V->code = car (SCHEME_V->code); 4195 SCHEME_V->code = car (SCHEME_V->code);
3716 s_goto (OP_LET1REC); 4196 s_goto (OP_LET1REC);
3717 4197
3718 case OP_LET1REC: /* letrec (calculate parameters) */ 4198 /* 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 4199
3739 case OP_LET2REC: /* letrec */ 4200 case OP_LET2REC: /* letrec */
3740 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y)) 4201 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3741 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4202 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3742 4203
… …
3772 } 4233 }
3773 else 4234 else
3774 { 4235 {
3775 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4236 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3776 s_return (NIL); 4237 s_return (NIL);
3777 else 4238
3778 {
3779 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4239 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3780 SCHEME_V->code = caar (SCHEME_V->code); 4240 SCHEME_V->code = caar (SCHEME_V->code);
3781 s_goto (OP_EVAL); 4241 s_goto (OP_EVAL);
3782 }
3783 } 4242 }
3784 4243
3785 case OP_DELAY: /* delay */ 4244 case OP_DELAY: /* delay */
3786 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 4245 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3787 set_typeflag (x, T_PROMISE); 4246 set_typeflag (x, T_PROMISE);
… …
3798 case OP_AND1: /* and */ 4257 case OP_AND1: /* and */
3799 if (is_false (SCHEME_V->value)) 4258 if (is_false (SCHEME_V->value))
3800 s_return (SCHEME_V->value); 4259 s_return (SCHEME_V->value);
3801 else if (SCHEME_V->code == NIL) 4260 else if (SCHEME_V->code == NIL)
3802 s_return (SCHEME_V->value); 4261 s_return (SCHEME_V->value);
3803 else 4262
3804 {
3805 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4263 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3806 SCHEME_V->code = car (SCHEME_V->code); 4264 SCHEME_V->code = car (SCHEME_V->code);
3807 s_goto (OP_EVAL); 4265 s_goto (OP_EVAL);
3808 }
3809 4266
3810 case OP_OR0: /* or */ 4267 case OP_OR0: /* or */
3811 if (SCHEME_V->code == NIL) 4268 if (SCHEME_V->code == NIL)
3812 s_return (S_F); 4269 s_return (S_F);
3813 4270
… …
3818 case OP_OR1: /* or */ 4275 case OP_OR1: /* or */
3819 if (is_true (SCHEME_V->value)) 4276 if (is_true (SCHEME_V->value))
3820 s_return (SCHEME_V->value); 4277 s_return (SCHEME_V->value);
3821 else if (SCHEME_V->code == NIL) 4278 else if (SCHEME_V->code == NIL)
3822 s_return (SCHEME_V->value); 4279 s_return (SCHEME_V->value);
3823 else 4280
3824 {
3825 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4281 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3826 SCHEME_V->code = car (SCHEME_V->code); 4282 SCHEME_V->code = car (SCHEME_V->code);
3827 s_goto (OP_EVAL); 4283 s_goto (OP_EVAL);
3828 }
3829 4284
3830 case OP_C0STREAM: /* cons-stream */ 4285 case OP_C0STREAM: /* cons-stream */
3831 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4286 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3832 SCHEME_V->code = car (SCHEME_V->code); 4287 SCHEME_V->code = car (SCHEME_V->code);
3833 s_goto (OP_EVAL); 4288 s_goto (OP_EVAL);
… …
3898 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4353 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3899 SCHEME_V->code = caar (x); 4354 SCHEME_V->code = caar (x);
3900 s_goto (OP_EVAL); 4355 s_goto (OP_EVAL);
3901 } 4356 }
3902 } 4357 }
3903 else 4358
3904 s_return (NIL); 4359 s_return (NIL);
3905 4360
3906 case OP_CASE2: /* case */ 4361 case OP_CASE2: /* case */
3907 if (is_true (SCHEME_V->value)) 4362 if (is_true (SCHEME_V->value))
3908 s_goto (OP_BEGIN); 4363 s_goto (OP_BEGIN);
3909 else 4364
3910 s_return (NIL); 4365 s_return (NIL);
3911 4366
3912 case OP_PAPPLY: /* apply */ 4367 case OP_PAPPLY: /* apply */
3913 SCHEME_V->code = car (args); 4368 SCHEME_V->code = car (args);
3914 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4369 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3915 /*SCHEME_V->args = cadr(args); */ 4370 /*SCHEME_V->args = cadr(args); */
… …
3929 } 4384 }
3930 4385
3931 if (USE_ERROR_CHECKING) abort (); 4386 if (USE_ERROR_CHECKING) abort ();
3932} 4387}
3933 4388
3934static int 4389/* math, cxr */
4390ecb_hot static int
3935opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4391opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3936{ 4392{
3937 pointer args = SCHEME_V->args; 4393 pointer args = SCHEME_V->args;
3938 pointer x = car (args); 4394 pointer x = car (args);
3939 num v; 4395 num v;
3940 4396
3941 switch (op) 4397 switch (op)
3942 { 4398 {
3943#if USE_MATH 4399#if USE_MATH
3944 case OP_INEX2EX: /* inexact->exact */ 4400 case OP_INEX2EX: /* inexact->exact */
3945 {
3946 if (is_integer (x)) 4401 if (!is_integer (x))
3947 s_return (x); 4402 {
3948
3949 RVALUE r = rvalue_unchecked (x); 4403 RVALUE r = rvalue_unchecked (x);
3950 4404
3951 if (r == (RVALUE)(IVALUE)r) 4405 if (r == (RVALUE)(IVALUE)r)
3952 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4406 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3953 else 4407 else
3954 Error_1 ("inexact->exact: not integral:", x); 4408 Error_1 ("inexact->exact: not integral:", x);
3955 } 4409 }
3956 4410
4411 s_return (x);
4412
4413 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4414 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4415 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4416 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4417
4418 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3957 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4419 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3958 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4420 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4421 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
3959 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4422 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3960 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4423 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3961 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4424 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3962 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4425 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3963 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4426 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3964 4427
3965 case OP_ATAN: 4428 case OP_ATAN:
4429 s_return (mk_real (SCHEME_A_
3966 if (cdr (args) == NIL) 4430 cdr (args) == NIL
3967 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4431 ? atan (rvalue (x))
3968 else 4432 : 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 4433
3977 case OP_EXPT: 4434 case OP_EXPT:
3978 { 4435 {
3979 RVALUE result; 4436 RVALUE result;
3980 int real_result = 1; 4437 int real_result = 1;
… …
4003 if (real_result) 4460 if (real_result)
4004 s_return (mk_real (SCHEME_A_ result)); 4461 s_return (mk_real (SCHEME_A_ result));
4005 else 4462 else
4006 s_return (mk_integer (SCHEME_A_ result)); 4463 s_return (mk_integer (SCHEME_A_ result));
4007 } 4464 }
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 4465#endif
4024 4466
4025 case OP_ADD: /* + */ 4467 case OP_ADD: /* + */
4026 v = num_zero; 4468 v = num_zero;
4027 4469
… …
4115 else 4557 else
4116 Error_0 ("modulo: division by zero"); 4558 Error_0 ("modulo: division by zero");
4117 4559
4118 s_return (mk_number (SCHEME_A_ v)); 4560 s_return (mk_number (SCHEME_A_ v));
4119 4561
4120 case OP_CAR: /* car */ 4562 /* the compiler will optimize this mess... */
4121 s_return (caar (args)); 4563 case OP_CAR: op_car: s_return (car (x));
4122 4564 case OP_CDR: op_cdr: s_return (cdr (x));
4123 case OP_CDR: /* cdr */ 4565 case OP_CAAR: op_caar: x = car (x); goto op_car;
4124 s_return (cdar (args)); 4566 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4567 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4568 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4569 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4570 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4571 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4572 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4573 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4574 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4575 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4576 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4577 case OP_CAAAAR: x = car (x); goto op_caaar;
4578 case OP_CAAADR: x = cdr (x); goto op_caaar;
4579 case OP_CAADAR: x = car (x); goto op_caadr;
4580 case OP_CAADDR: x = cdr (x); goto op_caadr;
4581 case OP_CADAAR: x = car (x); goto op_cadar;
4582 case OP_CADADR: x = cdr (x); goto op_cadar;
4583 case OP_CADDAR: x = car (x); goto op_caddr;
4584 case OP_CADDDR: x = cdr (x); goto op_caddr;
4585 case OP_CDAAAR: x = car (x); goto op_cdaar;
4586 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4587 case OP_CDADAR: x = car (x); goto op_cdadr;
4588 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4589 case OP_CDDAAR: x = car (x); goto op_cddar;
4590 case OP_CDDADR: x = cdr (x); goto op_cddar;
4591 case OP_CDDDAR: x = car (x); goto op_cdddr;
4592 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4125 4593
4126 case OP_CONS: /* cons */ 4594 case OP_CONS: /* cons */
4127 set_cdr (args, cadr (args)); 4595 set_cdr (args, cadr (args));
4128 s_return (args); 4596 s_return (args);
4129 4597
… …
4303 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4771 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4304 4772
4305 s_return (newstr); 4773 s_return (newstr);
4306 } 4774 }
4307 4775
4308 case OP_SUBSTR: /* substring */ 4776 case OP_STRING_COPY: /* substring/string-copy */
4309 { 4777 {
4310 char *str = strvalue (x); 4778 char *str = strvalue (x);
4311 int index0 = ivalue_unchecked (cadr (args)); 4779 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4312 int index1; 4780 int index1;
4313 int len; 4781 int len;
4314 4782
4315 if (index0 > strlength (x)) 4783 if (index0 > strlength (x))
4316 Error_1 ("substring: start out of bounds:", cadr (args)); 4784 Error_1 ("string->copy: start out of bounds:", cadr (args));
4317 4785
4318 if (cddr (args) != NIL) 4786 if (cddr (args) != NIL)
4319 { 4787 {
4320 index1 = ivalue_unchecked (caddr (args)); 4788 index1 = ivalue_unchecked (caddr (args));
4321 4789
4322 if (index1 > strlength (x) || index1 < index0) 4790 if (index1 > strlength (x) || index1 < index0)
4323 Error_1 ("substring: end out of bounds:", caddr (args)); 4791 Error_1 ("string->copy: end out of bounds:", caddr (args));
4324 } 4792 }
4325 else 4793 else
4326 index1 = strlength (x); 4794 index1 = strlength (x);
4327 4795
4328 len = index1 - index0; 4796 len = index1 - index0;
4329 x = mk_empty_string (SCHEME_A_ len, ' '); 4797 x = mk_counted_string (SCHEME_A_ str + index0, len);
4330 memcpy (strvalue (x), str + index0, len);
4331 strvalue (x)[len] = 0;
4332 4798
4333 s_return (x); 4799 s_return (x);
4334 } 4800 }
4335 4801
4336 case OP_VECTOR: /* vector */ 4802 case OP_VECTOR: /* vector */
… …
4378 } 4844 }
4379 4845
4380 case OP_VECLEN: /* vector-length */ 4846 case OP_VECLEN: /* vector-length */
4381 s_return (mk_integer (SCHEME_A_ veclength (x))); 4847 s_return (mk_integer (SCHEME_A_ veclength (x)));
4382 4848
4849 case OP_VECRESIZE:
4850 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4851 s_return (x);
4852
4383 case OP_VECREF: /* vector-ref */ 4853 case OP_VECREF: /* vector-ref */
4384 { 4854 {
4385 int index = ivalue_unchecked (cadr (args)); 4855 int index = ivalue_unchecked (cadr (args));
4386 4856
4387 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4857 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
… …
4406 } 4876 }
4407 4877
4408 if (USE_ERROR_CHECKING) abort (); 4878 if (USE_ERROR_CHECKING) abort ();
4409} 4879}
4410 4880
4411static int 4881/* relational ops */
4882ecb_hot static int
4412opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4883opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4413{ 4884{
4414 pointer x = SCHEME_V->args; 4885 pointer x = SCHEME_V->args;
4415 4886
4416 for (;;) 4887 for (;;)
… …
4437 } 4908 }
4438 4909
4439 s_return (S_T); 4910 s_return (S_T);
4440} 4911}
4441 4912
4442static int 4913/* predicates */
4914ecb_hot static int
4443opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4915opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4444{ 4916{
4445 pointer args = SCHEME_V->args; 4917 pointer args = SCHEME_V->args;
4446 pointer a = car (args); 4918 pointer a = car (args);
4447 pointer d = cdr (args); 4919 pointer d = cdr (args);
4448 int r; 4920 int r;
4449 4921
4450 switch (op) 4922 switch (op)
4451 { 4923 {
4452 case OP_NOT: /* not */ r = is_false (a) ; break; 4924 case OP_NOT: /* not */ r = is_false (a) ; break;
4453 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4925 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4454 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4926 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4455 case OP_NULLP: /* null? */ r = a == NIL ; break; 4927 case OP_NULLP: /* null? */ r = a == NIL ; break;
4456 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4928 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4929 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4457 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4930 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4458 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4931 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4459 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4932 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4460 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4933 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4461 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4934 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4462 4935
4463#if USE_CHAR_CLASSIFIERS 4936#if USE_CHAR_CLASSIFIERS
4464 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4937 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4465 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4938 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4466 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4939 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
… …
4493 } 4966 }
4494 4967
4495 s_retbool (r); 4968 s_retbool (r);
4496} 4969}
4497 4970
4498static int 4971/* promises, list ops, ports */
4972ecb_hot static int
4499opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4973opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4500{ 4974{
4501 pointer args = SCHEME_V->args; 4975 pointer args = SCHEME_V->args;
4502 pointer a = car (args); 4976 pointer a = car (args);
4503 pointer x, y; 4977 pointer x, y;
… …
4516 } 4990 }
4517 else 4991 else
4518 s_return (SCHEME_V->code); 4992 s_return (SCHEME_V->code);
4519 4993
4520 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4994 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4521 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4995 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4522 s_return (SCHEME_V->value); 4996 s_return (SCHEME_V->value);
4523 4997
4524#if USE_PORTS 4998#if USE_PORTS
4999
5000 case OP_EOF_OBJECT: /* eof-object */
5001 s_return (S_EOF);
4525 5002
4526 case OP_WRITE: /* write */ 5003 case OP_WRITE: /* write */
4527 case OP_DISPLAY: /* display */ 5004 case OP_DISPLAY: /* display */
4528 case OP_WRITE_CHAR: /* write-char */ 5005 case OP_WRITE_CHAR: /* write-char */
4529 if (is_pair (cdr (SCHEME_V->args))) 5006 if (is_pair (cdr (SCHEME_V->args)))
… …
4543 else 5020 else
4544 SCHEME_V->print_flag = 0; 5021 SCHEME_V->print_flag = 0;
4545 5022
4546 s_goto (OP_P0LIST); 5023 s_goto (OP_P0LIST);
4547 5024
5025 //TODO: move to scheme
4548 case OP_NEWLINE: /* newline */ 5026 case OP_NEWLINE: /* newline */
4549 if (is_pair (args)) 5027 if (is_pair (args))
4550 { 5028 {
4551 if (a != SCHEME_V->outport) 5029 if (a != SCHEME_V->outport)
4552 { 5030 {
… …
4554 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 5032 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4555 SCHEME_V->outport = a; 5033 SCHEME_V->outport = a;
4556 } 5034 }
4557 } 5035 }
4558 5036
4559 putstr (SCHEME_A_ "\n"); 5037 putcharacter (SCHEME_A_ '\n');
4560 s_return (S_T); 5038 s_return (S_T);
4561#endif 5039#endif
4562 5040
4563 case OP_ERR0: /* error */ 5041 case OP_ERR0: /* error */
4564 SCHEME_V->retcode = -1; 5042 SCHEME_V->retcode = -1;
… …
4573 putstr (SCHEME_A_ strvalue (car (args))); 5051 putstr (SCHEME_A_ strvalue (car (args)));
4574 SCHEME_V->args = cdr (args); 5052 SCHEME_V->args = cdr (args);
4575 s_goto (OP_ERR1); 5053 s_goto (OP_ERR1);
4576 5054
4577 case OP_ERR1: /* error */ 5055 case OP_ERR1: /* error */
4578 putstr (SCHEME_A_ " "); 5056 putcharacter (SCHEME_A_ ' ');
4579 5057
4580 if (args != NIL) 5058 if (args != NIL)
4581 { 5059 {
4582 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 5060 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4583 SCHEME_V->args = a; 5061 SCHEME_V->args = a;
4584 SCHEME_V->print_flag = 1; 5062 SCHEME_V->print_flag = 1;
4585 s_goto (OP_P0LIST); 5063 s_goto (OP_P0LIST);
4586 } 5064 }
4587 else 5065 else
4588 { 5066 {
4589 putstr (SCHEME_A_ "\n"); 5067 putcharacter (SCHEME_A_ '\n');
4590 5068
4591 if (SCHEME_V->interactive_repl) 5069 if (SCHEME_V->interactive_repl)
4592 s_goto (OP_T0LVL); 5070 s_goto (OP_T0LVL);
4593 else 5071 else
4594 return -1; 5072 return -1;
… …
4671 SCHEME_V->gc_verbose = (a != S_F); 5149 SCHEME_V->gc_verbose = (a != S_F);
4672 s_retbool (was); 5150 s_retbool (was);
4673 } 5151 }
4674 5152
4675 case OP_NEWSEGMENT: /* new-segment */ 5153 case OP_NEWSEGMENT: /* new-segment */
5154#if 0
4676 if (!is_pair (args) || !is_number (a)) 5155 if (!is_pair (args) || !is_number (a))
4677 Error_0 ("new-segment: argument must be a number"); 5156 Error_0 ("new-segment: argument must be a number");
4678 5157#endif
4679 alloc_cellseg (SCHEME_A_ ivalue (a)); 5158 s_retbool (alloc_cellseg (SCHEME_A));
4680
4681 s_return (S_T);
4682 5159
4683 case OP_OBLIST: /* oblist */ 5160 case OP_OBLIST: /* oblist */
4684 s_return (oblist_all_symbols (SCHEME_A)); 5161 s_return (oblist_all_symbols (SCHEME_A));
4685 5162
4686#if USE_PORTS 5163#if USE_PORTS
… …
4756 s_return (p == NIL ? S_F : p); 5233 s_return (p == NIL ? S_F : p);
4757 } 5234 }
4758 5235
4759 case OP_GET_OUTSTRING: /* get-output-string */ 5236 case OP_GET_OUTSTRING: /* get-output-string */
4760 { 5237 {
4761 port *p; 5238 port *p = port (a);
4762 5239
4763 if ((p = a->object.port)->kind & port_string) 5240 if (p->kind & port_string)
4764 { 5241 {
4765 off_t size; 5242 off_t size;
4766 char *str; 5243 char *str;
4767 5244
4768 size = p->rep.string.curr - p->rep.string.start + 1; 5245 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4803 } 5280 }
4804 5281
4805 if (USE_ERROR_CHECKING) abort (); 5282 if (USE_ERROR_CHECKING) abort ();
4806} 5283}
4807 5284
4808static int 5285/* reading */
5286ecb_cold static int
4809opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5287opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4810{ 5288{
4811 pointer args = SCHEME_V->args; 5289 pointer args = SCHEME_V->args;
4812 pointer x; 5290 pointer x;
4813 5291
… …
4873 int res; 5351 int res;
4874 5352
4875 if (is_pair (args)) 5353 if (is_pair (args))
4876 p = car (args); 5354 p = car (args);
4877 5355
4878 res = p->object.port->kind & port_string; 5356 res = port (p)->kind & port_string;
4879 5357
4880 s_retbool (res); 5358 s_retbool (res);
4881 } 5359 }
4882 5360
4883 case OP_SET_INPORT: /* set-input-port */ 5361 case OP_SET_INPORT: /* set-input-port */
… …
4892 case OP_RDSEXPR: 5370 case OP_RDSEXPR:
4893 switch (SCHEME_V->tok) 5371 switch (SCHEME_V->tok)
4894 { 5372 {
4895 case TOK_EOF: 5373 case TOK_EOF:
4896 s_return (S_EOF); 5374 s_return (S_EOF);
4897 /* NOTREACHED */
4898 5375
4899 case TOK_VEC: 5376 case TOK_VEC:
4900 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5377 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
4901 /* fall through */ 5378 /* fall through */
4902 5379
… …
4905 5382
4906 if (SCHEME_V->tok == TOK_RPAREN) 5383 if (SCHEME_V->tok == TOK_RPAREN)
4907 s_return (NIL); 5384 s_return (NIL);
4908 else if (SCHEME_V->tok == TOK_DOT) 5385 else if (SCHEME_V->tok == TOK_DOT)
4909 Error_0 ("syntax error: illegal dot expression"); 5386 Error_0 ("syntax error: illegal dot expression");
4910 else 5387
4911 {
4912 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5388 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
4913 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5389 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
4914 s_goto (OP_RDSEXPR); 5390 s_goto (OP_RDSEXPR);
4915 }
4916 5391
4917 case TOK_QUOTE: 5392 case TOK_QUOTE:
4918 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5393 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
4919 SCHEME_V->tok = token (SCHEME_A); 5394 SCHEME_V->tok = token (SCHEME_A);
4920 s_goto (OP_RDSEXPR); 5395 s_goto (OP_RDSEXPR);
… …
4926 { 5401 {
4927 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5402 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
4928 SCHEME_V->tok = TOK_LPAREN; 5403 SCHEME_V->tok = TOK_LPAREN;
4929 s_goto (OP_RDSEXPR); 5404 s_goto (OP_RDSEXPR);
4930 } 5405 }
4931 else 5406
4932 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5407 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
4933
4934 s_goto (OP_RDSEXPR); 5408 s_goto (OP_RDSEXPR);
4935 5409
4936 case TOK_COMMA: 5410 case TOK_COMMA:
4937 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5411 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
4938 SCHEME_V->tok = token (SCHEME_A); 5412 SCHEME_V->tok = token (SCHEME_A);
… …
4948 5422
4949 case TOK_DOTATOM: 5423 case TOK_DOTATOM:
4950 SCHEME_V->strbuff[0] = '.'; 5424 SCHEME_V->strbuff[0] = '.';
4951 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS))); 5425 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
4952 5426
5427 case TOK_STRATOM:
5428 //TODO: haven't checked whether the garbage collector could interfere and free x
5429 gc (SCHEME_A_ NIL, NIL); //TODO: superheavyhanded
5430 x = readstrexp (SCHEME_A_ '|');
5431 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5432
4953 case TOK_DQUOTE: 5433 case TOK_DQUOTE:
4954 x = readstrexp (SCHEME_A_ '"'); 5434 x = readstrexp (SCHEME_A_ '"');
4955 5435
4956 if (x == S_F) 5436 if (x == S_F)
4957 Error_0 ("Error reading string"); 5437 Error_0 ("Error reading string");
… …
4963 { 5443 {
4964 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1); 5444 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1);
4965 5445
4966 if (f == NIL) 5446 if (f == NIL)
4967 Error_0 ("undefined sharp expression"); 5447 Error_0 ("undefined sharp expression");
4968 else 5448
4969 {
4970 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5449 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
4971 s_goto (OP_EVAL); 5450 s_goto (OP_EVAL);
4972 }
4973 } 5451 }
4974 5452
4975 case TOK_SHARP_CONST: 5453 case TOK_SHARP_CONST:
4976 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL) 5454 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
4977 Error_0 ("undefined sharp expression"); 5455 Error_0 ("undefined sharp expression");
4978 else 5456
4979 s_return (x); 5457 s_return (x);
4980 5458
4981 default: 5459 default:
4982 Error_0 ("syntax error: illegal token"); 5460 Error_0 ("syntax error: illegal token");
4983 } 5461 }
4984 5462
… …
5077 pointer b = cdr (args); 5555 pointer b = cdr (args);
5078 int ok_abbr = ok_abbrev (b); 5556 int ok_abbr = ok_abbrev (b);
5079 SCHEME_V->args = car (b); 5557 SCHEME_V->args = car (b);
5080 5558
5081 if (a == SCHEME_V->QUOTE && ok_abbr) 5559 if (a == SCHEME_V->QUOTE && ok_abbr)
5082 putstr (SCHEME_A_ "'"); 5560 putcharacter (SCHEME_A_ '\'');
5083 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5561 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5084 putstr (SCHEME_A_ "`"); 5562 putcharacter (SCHEME_A_ '`');
5085 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5563 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5086 putstr (SCHEME_A_ ","); 5564 putcharacter (SCHEME_A_ ',');
5087 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5565 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5088 putstr (SCHEME_A_ ",@"); 5566 putstr (SCHEME_A_ ",@");
5089 else 5567 else
5090 { 5568 {
5091 putstr (SCHEME_A_ "("); 5569 putcharacter (SCHEME_A_ '(');
5092 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5570 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5093 SCHEME_V->args = a; 5571 SCHEME_V->args = a;
5094 } 5572 }
5095 5573
5096 s_goto (OP_P0LIST); 5574 s_goto (OP_P0LIST);
… …
5098 5576
5099 case OP_P1LIST: 5577 case OP_P1LIST:
5100 if (is_pair (args)) 5578 if (is_pair (args))
5101 { 5579 {
5102 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5580 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5103 putstr (SCHEME_A_ " "); 5581 putcharacter (SCHEME_A_ ' ');
5104 SCHEME_V->args = car (args); 5582 SCHEME_V->args = car (args);
5105 s_goto (OP_P0LIST); 5583 s_goto (OP_P0LIST);
5106 } 5584 }
5107 else if (is_vector (args)) 5585 else if (is_vector (args))
5108 { 5586 {
… …
5116 { 5594 {
5117 putstr (SCHEME_A_ " . "); 5595 putstr (SCHEME_A_ " . ");
5118 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5596 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5119 } 5597 }
5120 5598
5121 putstr (SCHEME_A_ ")"); 5599 putcharacter (SCHEME_A_ ')');
5122 s_return (S_T); 5600 s_return (S_T);
5123 } 5601 }
5124 5602
5125 case OP_PVECFROM: 5603 case OP_PVECFROM:
5126 { 5604 {
5127 int i = ivalue_unchecked (cdr (args)); 5605 IVALUE i = ivalue_unchecked (cdr (args));
5128 pointer vec = car (args); 5606 pointer vec = car (args);
5129 int len = veclength (vec); 5607 uint32_t len = veclength (vec);
5130 5608
5131 if (i == len) 5609 if (i == len)
5132 { 5610 {
5133 putstr (SCHEME_A_ ")"); 5611 putcharacter (SCHEME_A_ ')');
5134 s_return (S_T); 5612 s_return (S_T);
5135 } 5613 }
5136 else 5614 else
5137 { 5615 {
5138 pointer elem = vector_get (vec, i); 5616 pointer elem = vector_get (vec, i);
5139 5617
5140 ivalue_unchecked (cdr (args)) = i + 1; 5618 set_cdr (args, mk_integer (SCHEME_A_ i + 1));
5141 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5619 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5142 SCHEME_V->args = elem; 5620 SCHEME_V->args = elem;
5143 5621
5144 if (i > 0) 5622 if (i > 0)
5145 putstr (SCHEME_A_ " "); 5623 putcharacter (SCHEME_A_ ' ');
5146 5624
5147 s_goto (OP_P0LIST); 5625 s_goto (OP_P0LIST);
5148 } 5626 }
5149 } 5627 }
5150 } 5628 }
5151 5629
5152 if (USE_ERROR_CHECKING) abort (); 5630 if (USE_ERROR_CHECKING) abort ();
5153} 5631}
5154 5632
5155static int 5633/* list ops */
5634ecb_hot static int
5156opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5635opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5157{ 5636{
5158 pointer args = SCHEME_V->args; 5637 pointer args = SCHEME_V->args;
5159 pointer a = car (args); 5638 pointer a = car (args);
5160 pointer x, y; 5639 pointer x, y;
… …
5183 break; 5662 break;
5184 } 5663 }
5185 5664
5186 if (is_pair (y)) 5665 if (is_pair (y))
5187 s_return (car (y)); 5666 s_return (car (y));
5188 else 5667
5189 s_return (S_F); 5668 s_return (S_F);
5190
5191 5669
5192 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5670 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5193 SCHEME_V->args = a; 5671 SCHEME_V->args = a;
5194 5672
5195 if (SCHEME_V->args == NIL) 5673 if (SCHEME_V->args == NIL)
5196 s_return (S_F); 5674 s_return (S_F);
5197 else if (is_closure (SCHEME_V->args)) 5675 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5198 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5676 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5199 else if (is_macro (SCHEME_V->args)) 5677
5200 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5201 else
5202 s_return (S_F); 5678 s_return (S_F);
5203 5679
5204 case OP_CLOSUREP: /* closure? */ 5680 case OP_CLOSUREP: /* closure? */
5205 /* 5681 /*
5206 * Note, macro object is also a closure. 5682 * Note, macro object is also a closure.
5207 * Therefore, (closure? <#MACRO>) ==> #t 5683 * Therefore, (closure? <#MACRO>) ==> #t
5684 * (schmorp) well, obviously not, fix? TODO
5208 */ 5685 */
5209 s_retbool (is_closure (a)); 5686 s_retbool (is_closure (a));
5210 5687
5211 case OP_MACROP: /* macro? */ 5688 case OP_MACROP: /* macro? */
5212 s_retbool (is_macro (a)); 5689 s_retbool (is_macro (a));
… …
5217 5694
5218/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5695/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5219typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5696typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5220 5697
5221typedef int (*test_predicate)(pointer); 5698typedef int (*test_predicate)(pointer);
5222static int 5699
5700ecb_hot static int
5223tst_any (pointer p) 5701tst_any (pointer p)
5224{ 5702{
5225 return 1; 5703 return 1;
5226} 5704}
5227 5705
5228static int 5706ecb_hot static int
5229tst_inonneg (pointer p) 5707tst_inonneg (pointer p)
5230{ 5708{
5231 return is_integer (p) && ivalue_unchecked (p) >= 0; 5709 return is_integer (p) && ivalue_unchecked (p) >= 0;
5232} 5710}
5233 5711
5234static int 5712ecb_hot static int
5235tst_is_list (SCHEME_P_ pointer p) 5713tst_is_list (SCHEME_P_ pointer p)
5236{ 5714{
5237 return p == NIL || is_pair (p); 5715 return p == NIL || is_pair (p);
5238} 5716}
5239 5717
… …
5282#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5760#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5283#include "opdefines.h" 5761#include "opdefines.h"
5284#undef OP_DEF 5762#undef OP_DEF
5285; 5763;
5286 5764
5287static const char * 5765ecb_cold static const char *
5288opname (int idx) 5766opname (int idx)
5289{ 5767{
5290 const char *name = opnames; 5768 const char *name = opnames;
5291 5769
5292 /* should do this at compile time, but would require external program, right? */ 5770 /* should do this at compile time, but would require external program, right? */
… …
5294 name += strlen (name) + 1; 5772 name += strlen (name) + 1;
5295 5773
5296 return *name ? name : "ILLEGAL"; 5774 return *name ? name : "ILLEGAL";
5297} 5775}
5298 5776
5299static const char * 5777ecb_cold static const char *
5300procname (pointer x) 5778procname (pointer x)
5301{ 5779{
5302 return opname (procnum (x)); 5780 return opname (procnum (x));
5303} 5781}
5304 5782
… …
5324#undef OP_DEF 5802#undef OP_DEF
5325 {0} 5803 {0}
5326}; 5804};
5327 5805
5328/* kernel of this interpreter */ 5806/* kernel of this interpreter */
5329static void ecb_hot 5807ecb_hot static void
5330Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5808Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5331{ 5809{
5332 SCHEME_V->op = op; 5810 SCHEME_V->op = op;
5333 5811
5334 for (;;) 5812 for (;;)
… …
5417 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5895 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5418 return; 5896 return;
5419 5897
5420 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5898 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5421 { 5899 {
5422 xwrstr ("No memory!\n"); 5900 putstr (SCHEME_A_ "No memory!\n");
5423 return; 5901 return;
5424 } 5902 }
5425 } 5903 }
5426} 5904}
5427 5905
5428/* ========== Initialization of internal keywords ========== */ 5906/* ========== Initialization of internal keywords ========== */
5429 5907
5430static void 5908ecb_cold static void
5431assign_syntax (SCHEME_P_ const char *name) 5909assign_syntax (SCHEME_P_ const char *name)
5432{ 5910{
5433 pointer x = oblist_add_by_name (SCHEME_A_ name); 5911 pointer x = oblist_add_by_name (SCHEME_A_ name);
5434 set_typeflag (x, typeflag (x) | T_SYNTAX); 5912 set_typeflag (x, typeflag (x) | T_SYNTAX);
5435} 5913}
5436 5914
5437static void 5915ecb_cold static void
5438assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5916assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5439{ 5917{
5440 pointer x = mk_symbol (SCHEME_A_ name); 5918 pointer x = mk_symbol (SCHEME_A_ name);
5441 pointer y = mk_proc (SCHEME_A_ op); 5919 pointer y = mk_proc (SCHEME_A_ op);
5442 new_slot_in_env (SCHEME_A_ x, y); 5920 new_slot_in_env (SCHEME_A_ x, y);
… …
5445static pointer 5923static pointer
5446mk_proc (SCHEME_P_ enum scheme_opcodes op) 5924mk_proc (SCHEME_P_ enum scheme_opcodes op)
5447{ 5925{
5448 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5926 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5449 set_typeflag (y, (T_PROC | T_ATOM)); 5927 set_typeflag (y, (T_PROC | T_ATOM));
5450 ivalue_unchecked (y) = op; 5928 set_ivalue (y, op);
5451 return y; 5929 return y;
5452} 5930}
5453 5931
5454/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5932/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5455static int 5933ecb_hot static int
5456syntaxnum (pointer p) 5934syntaxnum (pointer p)
5457{ 5935{
5458 const char *s = strvalue (car (p)); 5936 const char *s = strvalue (p);
5459 5937
5460 switch (strlength (car (p))) 5938 switch (strlength (p))
5461 { 5939 {
5462 case 2: 5940 case 2:
5463 if (s[0] == 'i') 5941 if (s[0] == 'i')
5464 return OP_IF0; /* if */ 5942 return OP_IF0; /* if */
5465 else 5943 else
… …
5539 6017
5540ecb_cold int 6018ecb_cold int
5541scheme_init (SCHEME_P) 6019scheme_init (SCHEME_P)
5542{ 6020{
5543 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 6021 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5544 pointer x; 6022
6023 /* this memset is not strictly correct, as we assume (intcache)
6024 * that memset 0 will also set pointers to 0, but memset does
6025 * of course not guarantee that. screw such systems.
6026 */
6027 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5545 6028
5546 num_set_fixnum (num_zero, 1); 6029 num_set_fixnum (num_zero, 1);
5547 num_set_ivalue (num_zero, 0); 6030 num_set_ivalue (num_zero, 0);
5548 num_set_fixnum (num_one, 1); 6031 num_set_fixnum (num_one, 1);
5549 num_set_ivalue (num_one, 1); 6032 num_set_ivalue (num_one, 1);
… …
5561 SCHEME_V->save_inport = NIL; 6044 SCHEME_V->save_inport = NIL;
5562 SCHEME_V->loadport = NIL; 6045 SCHEME_V->loadport = NIL;
5563 SCHEME_V->nesting = 0; 6046 SCHEME_V->nesting = 0;
5564 SCHEME_V->interactive_repl = 0; 6047 SCHEME_V->interactive_repl = 0;
5565 6048
5566 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 6049 if (!alloc_cellseg (SCHEME_A))
5567 { 6050 {
5568#if USE_ERROR_CHECKING 6051#if USE_ERROR_CHECKING
5569 SCHEME_V->no_memory = 1; 6052 SCHEME_V->no_memory = 1;
5570 return 0; 6053 return 0;
5571#endif 6054#endif
5572 } 6055 }
5573 6056
5574 SCHEME_V->gc_verbose = 0; 6057 SCHEME_V->gc_verbose = 0;
5575 dump_stack_initialize (SCHEME_A); 6058 dump_stack_initialize (SCHEME_A);
5576 SCHEME_V->code = NIL; 6059 SCHEME_V->code = NIL;
5577 SCHEME_V->args = NIL; 6060 SCHEME_V->args = NIL;
5578 SCHEME_V->envir = NIL; 6061 SCHEME_V->envir = NIL;
6062 SCHEME_V->value = NIL;
5579 SCHEME_V->tracing = 0; 6063 SCHEME_V->tracing = 0;
5580 6064
5581 /* init NIL */ 6065 /* init NIL */
5582 set_typeflag (NIL, T_ATOM | T_MARK); 6066 set_typeflag (NIL, T_SPECIAL | T_ATOM);
5583 set_car (NIL, NIL); 6067 set_car (NIL, NIL);
5584 set_cdr (NIL, NIL); 6068 set_cdr (NIL, NIL);
5585 /* init T */ 6069 /* init T */
5586 set_typeflag (S_T, T_ATOM | T_MARK); 6070 set_typeflag (S_T, T_SPECIAL | T_ATOM);
5587 set_car (S_T, S_T); 6071 set_car (S_T, S_T);
5588 set_cdr (S_T, S_T); 6072 set_cdr (S_T, S_T);
5589 /* init F */ 6073 /* init F */
5590 set_typeflag (S_F, T_ATOM | T_MARK); 6074 set_typeflag (S_F, T_SPECIAL | T_ATOM);
5591 set_car (S_F, S_F); 6075 set_car (S_F, S_F);
5592 set_cdr (S_F, S_F); 6076 set_cdr (S_F, S_F);
5593 /* init EOF_OBJ */ 6077 /* init EOF_OBJ */
5594 set_typeflag (S_EOF, T_ATOM | T_MARK); 6078 set_typeflag (S_EOF, T_SPECIAL | T_ATOM);
5595 set_car (S_EOF, S_EOF); 6079 set_car (S_EOF, S_EOF);
5596 set_cdr (S_EOF, S_EOF); 6080 set_cdr (S_EOF, S_EOF);
5597 /* init sink */ 6081 /* init sink */
5598 set_typeflag (S_SINK, T_PAIR | T_MARK); 6082 set_typeflag (S_SINK, T_PAIR);
5599 set_car (S_SINK, NIL); 6083 set_car (S_SINK, NIL);
5600 6084
5601 /* init c_nest */ 6085 /* init c_nest */
5602 SCHEME_V->c_nest = NIL; 6086 SCHEME_V->c_nest = NIL;
5603 6087
5604 SCHEME_V->oblist = oblist_initial_value (SCHEME_A); 6088 SCHEME_V->oblist = oblist_initial_value (SCHEME_A);
5605 /* init global_env */ 6089 /* init global_env */
5606 new_frame_in_env (SCHEME_A_ NIL); 6090 new_frame_in_env (SCHEME_A_ NIL);
5607 SCHEME_V->global_env = SCHEME_V->envir; 6091 SCHEME_V->global_env = SCHEME_V->envir;
5608 /* init else */ 6092 /* init else */
5609 x = mk_symbol (SCHEME_A_ "else"); 6093 new_slot_in_env (SCHEME_A_ mk_symbol (SCHEME_A_ "else"), S_T);
5610 new_slot_in_env (SCHEME_A_ x, S_T);
5611 6094
5612 { 6095 {
5613 static const char *syntax_names[] = { 6096 static const char *syntax_names[] = {
5614 "lambda", "quote", "define", "if", "begin", "set!", 6097 "lambda", "quote", "define", "if", "begin", "set!",
5615 "let", "let*", "letrec", "cond", "delay", "and", 6098 "let", "let*", "letrec", "cond", "delay", "and",
… …
5639 6122
5640 return !SCHEME_V->no_memory; 6123 return !SCHEME_V->no_memory;
5641} 6124}
5642 6125
5643#if USE_PORTS 6126#if USE_PORTS
5644void 6127ecb_cold void
5645scheme_set_input_port_file (SCHEME_P_ int fin) 6128scheme_set_input_port_file (SCHEME_P_ int fin)
5646{ 6129{
5647 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6130 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5648} 6131}
5649 6132
5650void 6133ecb_cold void
5651scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 6134scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5652{ 6135{
5653 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 6136 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5654} 6137}
5655 6138
5656void 6139ecb_cold void
5657scheme_set_output_port_file (SCHEME_P_ int fout) 6140scheme_set_output_port_file (SCHEME_P_ int fout)
5658{ 6141{
5659 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6142 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5660} 6143}
5661 6144
5662void 6145ecb_cold void
5663scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 6146scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5664{ 6147{
5665 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 6148 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5666} 6149}
5667#endif 6150#endif
5668 6151
5669void 6152ecb_cold void
5670scheme_set_external_data (SCHEME_P_ void *p) 6153scheme_set_external_data (SCHEME_P_ void *p)
5671{ 6154{
5672 SCHEME_V->ext_data = p; 6155 SCHEME_V->ext_data = p;
5673} 6156}
5674 6157
… …
5706 SCHEME_V->loadport = NIL; 6189 SCHEME_V->loadport = NIL;
5707 SCHEME_V->gc_verbose = 0; 6190 SCHEME_V->gc_verbose = 0;
5708 gc (SCHEME_A_ NIL, NIL); 6191 gc (SCHEME_A_ NIL, NIL);
5709 6192
5710 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6193 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5711 free (SCHEME_V->alloc_seg[i]); 6194 free (SCHEME_V->cell_seg[i]);
5712 6195
5713#if SHOW_ERROR_LINE 6196#if SHOW_ERROR_LINE
5714 for (i = 0; i <= SCHEME_V->file_i; i++) 6197 for (i = 0; i <= SCHEME_V->file_i; i++)
5715 {
5716 if (SCHEME_V->load_stack[i].kind & port_file) 6198 if (SCHEME_V->load_stack[i].kind & port_file)
5717 { 6199 {
5718 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6200 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5719 6201
5720 if (fname) 6202 if (fname)
5721 free (fname); 6203 free (fname);
5722 } 6204 }
5723 }
5724#endif 6205#endif
5725} 6206}
5726 6207
5727void 6208ecb_cold void
5728scheme_load_file (SCHEME_P_ int fin) 6209scheme_load_file (SCHEME_P_ int fin)
5729{ 6210{
5730 scheme_load_named_file (SCHEME_A_ fin, 0); 6211 scheme_load_named_file (SCHEME_A_ fin, 0);
5731} 6212}
5732 6213
5733void 6214ecb_cold void
5734scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6215scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5735{ 6216{
5736 dump_stack_reset (SCHEME_A); 6217 dump_stack_reset (SCHEME_A);
5737 SCHEME_V->envir = SCHEME_V->global_env; 6218 SCHEME_V->envir = SCHEME_V->global_env;
5738 SCHEME_V->file_i = 0; 6219 SCHEME_V->file_i = 0;
5739 SCHEME_V->load_stack[0].unget = -1; 6220 SCHEME_V->load_stack[0].unget = -1;
5740 SCHEME_V->load_stack[0].kind = port_input | port_file; 6221 SCHEME_V->load_stack[0].kind = port_input | port_file;
5741 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6222 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); 6223 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5744#endif
5745 SCHEME_V->retcode = 0; 6224 SCHEME_V->retcode = 0;
5746 6225
5747#if USE_PORTS
5748 if (fin == STDIN_FILENO) 6226 if (fin == STDIN_FILENO)
5749 SCHEME_V->interactive_repl = 1; 6227 SCHEME_V->interactive_repl = 1;
5750#endif
5751 6228
5752#if USE_PORTS 6229#if USE_PORTS
5753#if SHOW_ERROR_LINE 6230#if SHOW_ERROR_LINE
5754 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6231 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5755 6232
… …
5759#endif 6236#endif
5760 6237
5761 SCHEME_V->inport = SCHEME_V->loadport; 6238 SCHEME_V->inport = SCHEME_V->loadport;
5762 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6239 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5763 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6240 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6241
5764 set_typeflag (SCHEME_V->loadport, T_ATOM); 6242 set_typeflag (SCHEME_V->loadport, T_ATOM);
5765 6243
5766 if (SCHEME_V->retcode == 0) 6244 if (SCHEME_V->retcode == 0)
5767 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6245 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5768} 6246}
5769 6247
5770void 6248ecb_cold void
5771scheme_load_string (SCHEME_P_ const char *cmd) 6249scheme_load_string (SCHEME_P_ const char *cmd)
5772{ 6250{
6251#if USE_PORTs
5773 dump_stack_reset (SCHEME_A); 6252 dump_stack_reset (SCHEME_A);
5774 SCHEME_V->envir = SCHEME_V->global_env; 6253 SCHEME_V->envir = SCHEME_V->global_env;
5775 SCHEME_V->file_i = 0; 6254 SCHEME_V->file_i = 0;
5776 SCHEME_V->load_stack[0].kind = port_input | port_string; 6255 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 */ 6256 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); 6257 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; 6258 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); 6259 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5782#endif
5783 SCHEME_V->retcode = 0; 6260 SCHEME_V->retcode = 0;
5784 SCHEME_V->interactive_repl = 0; 6261 SCHEME_V->interactive_repl = 0;
5785 SCHEME_V->inport = SCHEME_V->loadport; 6262 SCHEME_V->inport = SCHEME_V->loadport;
5786 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6263 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5787 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6264 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5788 set_typeflag (SCHEME_V->loadport, T_ATOM); 6265 set_typeflag (SCHEME_V->loadport, T_ATOM);
5789 6266
5790 if (SCHEME_V->retcode == 0) 6267 if (SCHEME_V->retcode == 0)
5791 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6268 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6269#else
6270 abort ();
6271#endif
5792} 6272}
5793 6273
5794void 6274ecb_cold void
5795scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6275scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5796{ 6276{
5797 pointer x; 6277 pointer x;
5798 6278
5799 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6279 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5804 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6284 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5805} 6285}
5806 6286
5807#if !STANDALONE 6287#if !STANDALONE
5808 6288
5809void 6289ecb_cold void
5810scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6290scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5811{ 6291{
5812 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6292 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5813} 6293}
5814 6294
5815void 6295ecb_cold void
5816scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6296scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5817{ 6297{
5818 int i; 6298 int i;
5819 6299
5820 for (i = 0; i < count; i++) 6300 for (i = 0; i < count; i++)
5821 scheme_register_foreign_func (SCHEME_A_ list + i); 6301 scheme_register_foreign_func (SCHEME_A_ list + i);
5822} 6302}
5823 6303
5824pointer 6304ecb_cold pointer
5825scheme_apply0 (SCHEME_P_ const char *procname) 6305scheme_apply0 (SCHEME_P_ const char *procname)
5826{ 6306{
5827 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6307 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5828} 6308}
5829 6309
5830void 6310ecb_cold void
5831save_from_C_call (SCHEME_P) 6311save_from_C_call (SCHEME_P)
5832{ 6312{
5833 pointer saved_data = cons (car (S_SINK), 6313 pointer saved_data = cons (car (S_SINK),
5834 cons (SCHEME_V->envir, 6314 cons (SCHEME_V->envir,
5835 SCHEME_V->dump)); 6315 SCHEME_V->dump));
… …
5839 /* Truncate the dump stack so TS will return here when done, not 6319 /* Truncate the dump stack so TS will return here when done, not
5840 directly resume pre-C-call operations. */ 6320 directly resume pre-C-call operations. */
5841 dump_stack_reset (SCHEME_A); 6321 dump_stack_reset (SCHEME_A);
5842} 6322}
5843 6323
5844void 6324ecb_cold void
5845restore_from_C_call (SCHEME_P) 6325restore_from_C_call (SCHEME_P)
5846{ 6326{
5847 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6327 set_car (S_SINK, caar (SCHEME_V->c_nest));
5848 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6328 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5849 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6329 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5850 /* Pop */ 6330 /* Pop */
5851 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6331 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5852} 6332}
5853 6333
5854/* "func" and "args" are assumed to be already eval'ed. */ 6334/* "func" and "args" are assumed to be already eval'ed. */
5855pointer 6335ecb_cold pointer
5856scheme_call (SCHEME_P_ pointer func, pointer args) 6336scheme_call (SCHEME_P_ pointer func, pointer args)
5857{ 6337{
5858 int old_repl = SCHEME_V->interactive_repl; 6338 int old_repl = SCHEME_V->interactive_repl;
5859 6339
5860 SCHEME_V->interactive_repl = 0; 6340 SCHEME_V->interactive_repl = 0;
… …
5867 SCHEME_V->interactive_repl = old_repl; 6347 SCHEME_V->interactive_repl = old_repl;
5868 restore_from_C_call (SCHEME_A); 6348 restore_from_C_call (SCHEME_A);
5869 return SCHEME_V->value; 6349 return SCHEME_V->value;
5870} 6350}
5871 6351
5872pointer 6352ecb_cold pointer
5873scheme_eval (SCHEME_P_ pointer obj) 6353scheme_eval (SCHEME_P_ pointer obj)
5874{ 6354{
5875 int old_repl = SCHEME_V->interactive_repl; 6355 int old_repl = SCHEME_V->interactive_repl;
5876 6356
5877 SCHEME_V->interactive_repl = 0; 6357 SCHEME_V->interactive_repl = 0;
… …
5889 6369
5890/* ========== Main ========== */ 6370/* ========== Main ========== */
5891 6371
5892#if STANDALONE 6372#if STANDALONE
5893 6373
5894int 6374ecb_cold int
5895main (int argc, char **argv) 6375main (int argc, char **argv)
5896{ 6376{
5897# if USE_MULTIPLICITY 6377# if USE_MULTIPLICITY
5898 scheme ssc; 6378 scheme ssc;
5899 scheme *const SCHEME_V = &ssc; 6379 scheme *const SCHEME_V = &ssc;
… …
5901# endif 6381# endif
5902 int fin; 6382 int fin;
5903 char *file_name = InitFile; 6383 char *file_name = InitFile;
5904 int retcode; 6384 int retcode;
5905 int isfile = 1; 6385 int isfile = 1;
6386#if EXPERIMENT
6387 system ("ps v $PPID");
6388#endif
5906 6389
5907 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6390 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5908 { 6391 {
5909 xwrstr ("Usage: tinyscheme -?\n"); 6392 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5910 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6393 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5911 xwrstr ("followed by\n"); 6394 putstr (SCHEME_A_ "followed by\n");
5912 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6395 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5913 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6396 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5914 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6397 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5915 xwrstr ("Use - as filename for stdin.\n"); 6398 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5916 return 1; 6399 return 1;
5917 } 6400 }
5918 6401
5919 if (!scheme_init (SCHEME_A)) 6402 if (!scheme_init (SCHEME_A))
5920 { 6403 {
5921 xwrstr ("Could not initialize!\n"); 6404 putstr (SCHEME_A_ "Could not initialize!\n");
5922 return 2; 6405 return 2;
5923 } 6406 }
5924 6407
5925# if USE_PORTS 6408# if USE_PORTS
5926 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6409 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
5939 } 6422 }
5940#endif 6423#endif
5941 6424
5942 do 6425 do
5943 { 6426 {
5944#if USE_PORTS
5945 if (strcmp (file_name, "-") == 0) 6427 if (strcmp (file_name, "-") == 0)
5946 fin = STDIN_FILENO; 6428 fin = STDIN_FILENO;
5947 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6429 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
5948 { 6430 {
5949 pointer args = NIL; 6431 pointer args = NIL;
… …
5967 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6449 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
5968 6450
5969 } 6451 }
5970 else 6452 else
5971 fin = open (file_name, O_RDONLY); 6453 fin = open (file_name, O_RDONLY);
5972#endif
5973 6454
5974 if (isfile && fin < 0) 6455 if (isfile && fin < 0)
5975 { 6456 {
5976 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6457 putstr (SCHEME_A_ "Could not open file ");
6458 putstr (SCHEME_A_ file_name);
6459 putcharacter (SCHEME_A_ '\n');
5977 } 6460 }
5978 else 6461 else
5979 { 6462 {
5980 if (isfile) 6463 if (isfile)
5981 scheme_load_named_file (SCHEME_A_ fin, file_name); 6464 scheme_load_named_file (SCHEME_A_ fin, file_name);
5982 else 6465 else
5983 scheme_load_string (SCHEME_A_ file_name); 6466 scheme_load_string (SCHEME_A_ file_name);
5984 6467
5985#if USE_PORTS
5986 if (!isfile || fin != STDIN_FILENO) 6468 if (!isfile || fin != STDIN_FILENO)
5987 { 6469 {
5988 if (SCHEME_V->retcode != 0) 6470 if (SCHEME_V->retcode != 0)
5989 { 6471 {
5990 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6472 putstr (SCHEME_A_ "Errors encountered reading ");
6473 putstr (SCHEME_A_ file_name);
6474 putcharacter (SCHEME_A_ '\n');
5991 } 6475 }
5992 6476
5993 if (isfile) 6477 if (isfile)
5994 close (fin); 6478 close (fin);
5995 } 6479 }
5996#endif
5997 } 6480 }
5998 6481
5999 file_name = *argv++; 6482 file_name = *argv++;
6000 } 6483 }
6001 while (file_name != 0); 6484 while (file_name != 0);

Diff Legend

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