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.29 by root, Sat Nov 28 10:31:06 2015 UTC vs.
Revision 1.62 by root, Wed Dec 2 07:59:15 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 _GNU_SOURCE 1
22#include "malloc.c" 22#define _POSIX_C_SOURCE 200201
23#define _XOPEN_SOURCE 600
24
23 25
24#define SCHEME_SOURCE 26#define SCHEME_SOURCE
25#include "scheme-private.h" 27#include "scheme-private.h"
26#ifndef WIN32 28#ifndef WIN32
27# include <unistd.h> 29# include <unistd.h>
… …
34 36
35#include <sys/types.h> 37#include <sys/types.h>
36#include <sys/stat.h> 38#include <sys/stat.h>
37#include <fcntl.h> 39#include <fcntl.h>
38 40
41#if !USE_ERROR_CHECKING
42# define NDEBUG
43#endif
44
45#include <assert.h>
46#include <stdlib.h>
39#include <string.h> 47#include <string.h>
40#include <stdlib.h>
41 48
42#include <limits.h> 49#include <limits.h>
43#include <inttypes.h> 50#include <inttypes.h>
44#include <float.h> 51#include <float.h>
45//#include <ctype.h> 52
53#if !USE_SYSTEM_MALLOC
54# define PAGE_SIZE 4096 /* does not work on sparc/alpha */
55# include "malloc.c"
56# define malloc(n) tiny_malloc (n)
57# define realloc(p,n) tiny_realloc (p, n)
58# define free(p) tiny_free (p)
59#endif
60
61#if '1' != '0' + 1 \
62 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
63 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
64 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
65 || 'f' != 'a' + 5
66# error "execution character set digits not consecutive"
67#endif
46 68
47enum { 69enum {
48 TOK_EOF, 70 TOK_EOF,
49 TOK_LPAREN, 71 TOK_LPAREN,
50 TOK_RPAREN, 72 TOK_RPAREN,
51 TOK_DOT, 73 TOK_DOT,
52 TOK_ATOM, 74 TOK_ATOM,
75 TOK_DOTATOM, /* atom name starting with '.' */
76 TOK_STRATOM, /* atom name enclosed in | */
53 TOK_QUOTE, 77 TOK_QUOTE,
54 TOK_DQUOTE, 78 TOK_DQUOTE,
55 TOK_BQUOTE, 79 TOK_BQUOTE,
56 TOK_COMMA, 80 TOK_COMMA,
57 TOK_ATMARK, 81 TOK_ATMARK,
… …
59 TOK_SHARP_CONST, 83 TOK_SHARP_CONST,
60 TOK_VEC 84 TOK_VEC
61}; 85};
62 86
63#define BACKQUOTE '`' 87#define BACKQUOTE '`'
64#define DELIMITERS "()\";\f\t\v\n\r " 88#define WHITESPACE " \t\r\n\v\f"
89#define DELIMITERS "()\";" WHITESPACE
65 90
66#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 91#define NIL POINTER (&SCHEME_V->xNIL)
67#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 92#define S_T POINTER (&SCHEME_V->xT)
68#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 93#define S_F POINTER (&SCHEME_V->xF)
69#define S_SINK (&SCHEME_V->xsink) 94#define S_SINK POINTER (&SCHEME_V->xsink)
70#define S_EOF (&SCHEME_V->xEOF_OBJ) 95#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
71 96
72#if !USE_MULTIPLICITY 97#if !USE_MULTIPLICITY
73static scheme sc; 98static scheme sc;
74#endif 99#endif
75 100
76static void 101ecb_cold static void
77xbase (char *s, long n, int base) 102xbase (char *s, long n, int base)
78{ 103{
79 if (n < 0) 104 if (n < 0)
80 { 105 {
81 *s++ = '-'; 106 *s++ = '-';
… …
83 } 108 }
84 109
85 char *p = s; 110 char *p = s;
86 111
87 do { 112 do {
88 *p++ = '0' + n % base; 113 *p++ = "0123456789abcdef"[n % base];
89 n /= base; 114 n /= base;
90 } while (n); 115 } while (n);
91 116
92 *p-- = 0; 117 *p-- = 0;
93 118
… …
96 char x = *s; *s = *p; *p = x; 121 char x = *s; *s = *p; *p = x;
97 --p; ++s; 122 --p; ++s;
98 } 123 }
99} 124}
100 125
101static void 126ecb_cold static void
102xnum (char *s, long n) 127xnum (char *s, long n)
103{ 128{
104 xbase (s, n, 10); 129 xbase (s, n, 10);
105} 130}
106 131
107static void 132ecb_cold static void
108xwrstr (const char *s) 133putnum (SCHEME_P_ long n)
109{
110 write (1, s, strlen (s));
111}
112
113static void
114xwrnum (long n)
115{ 134{
116 char buf[64]; 135 char buf[64];
117 136
118 xnum (buf, n); 137 xnum (buf, n);
119 xwrstr (buf); 138 putstr (SCHEME_A_ buf);
120} 139}
140
141#if USE_CHAR_CLASSIFIERS
142#include <ctype.h>
143#else
121 144
122static char 145static char
123xtoupper (char c) 146xtoupper (char c)
124{ 147{
125 if (c >= 'a' && c <= 'z') 148 if (c >= 'a' && c <= 'z')
… …
145 168
146#define toupper(c) xtoupper (c) 169#define toupper(c) xtoupper (c)
147#define tolower(c) xtolower (c) 170#define tolower(c) xtolower (c)
148#define isdigit(c) xisdigit (c) 171#define isdigit(c) xisdigit (c)
149 172
173#endif
174
150#if USE_IGNORECASE 175#if USE_IGNORECASE
151static const char * 176ecb_cold static const char *
152xstrlwr (char *s) 177xstrlwr (char *s)
153{ 178{
154 const char *p = s; 179 const char *p = s;
155 180
156 while (*s) 181 while (*s)
… …
176 201
177#ifndef InitFile 202#ifndef InitFile
178# define InitFile "init.scm" 203# define InitFile "init.scm"
179#endif 204#endif
180 205
181#ifndef FIRST_CELLSEGS
182# define FIRST_CELLSEGS 3
183#endif
184
185enum scheme_types 206enum scheme_types
186{ 207{
187 T_INTEGER, 208 T_INTEGER,
209 T_CHARACTER,
188 T_REAL, 210 T_REAL,
189 T_STRING, 211 T_STRING,
190 T_SYMBOL, 212 T_SYMBOL,
191 T_PROC, 213 T_PROC,
192 T_PAIR, /* also used for free cells */ 214 T_PAIR, /* also used for free cells */
193 T_CLOSURE, 215 T_CLOSURE,
216 T_BYTECODE, // temp
217 T_MACRO,
194 T_CONTINUATION, 218 T_CONTINUATION,
195 T_FOREIGN, 219 T_FOREIGN,
196 T_CHARACTER,
197 T_PORT, 220 T_PORT,
198 T_VECTOR, 221 T_VECTOR,
199 T_MACRO,
200 T_PROMISE, 222 T_PROMISE,
201 T_ENVIRONMENT, 223 T_ENVIRONMENT,
202 /* one more... */ 224
203 T_NUM_SYSTEM_TYPES 225 T_NUM_SYSTEM_TYPES
204}; 226};
205 227
206#define T_MASKTYPE 0x000f 228#define T_MASKTYPE 0x000f
207#define T_SYNTAX 0x0010 229#define T_SYNTAX 0x0010
… …
240static num num_op (enum num_op op, num a, num b); 262static num num_op (enum num_op op, num a, num b);
241static num num_intdiv (num a, num b); 263static num num_intdiv (num a, num b);
242static num num_rem (num a, num b); 264static num num_rem (num a, num b);
243static num num_mod (num a, num b); 265static num num_mod (num a, num b);
244 266
245#if USE_MATH
246static double round_per_R5RS (double x);
247#endif
248static int is_zero_rvalue (RVALUE x); 267static int is_zero_rvalue (RVALUE x);
249 268
250static num num_zero; 269static num num_zero;
251static num num_one; 270static num num_one;
252 271
272/* convert "pointer" to cell* / cell* to pointer */
273#define CELL(p) ((struct cell *)(p) + 0)
274#define POINTER(c) ((void *)((c) - 0))
275
253/* macros for cell operations */ 276/* macros for cell operations */
254#define typeflag(p) ((p)->flag + 0) 277#define typeflag(p) (CELL(p)->flag + 0)
255#define set_typeflag(p,v) ((p)->flag = (v)) 278#define set_typeflag(p,v) (CELL(p)->flag = (v))
256#define type(p) (typeflag (p) & T_MASKTYPE) 279#define type(p) (typeflag (p) & T_MASKTYPE)
257 280
258INTERFACE int 281INTERFACE int
259is_string (pointer p) 282is_string (pointer p)
260{ 283{
261 return type (p) == T_STRING; 284 return type (p) == T_STRING;
262} 285}
263 286
264#define strvalue(p) ((p)->object.string.svalue) 287#define strvalue(p) (CELL(p)->object.string.svalue)
265#define strlength(p) ((p)->object.string.length) 288#define strlength(p) (CELL(p)->object.string.length)
266 289
267INTERFACE int 290INTERFACE int
268is_vector (pointer p) 291is_vector (pointer p)
269{ 292{
270 return type (p) == T_VECTOR; 293 return type (p) == T_VECTOR;
271} 294}
272 295
273#define vecvalue(p) ((p)->object.vector.vvalue) 296#define vecvalue(p) (CELL(p)->object.vector.vvalue)
274#define veclength(p) ((p)->object.vector.length) 297#define veclength(p) (CELL(p)->object.vector.length)
275INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj); 298INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
276INTERFACE pointer vector_get (pointer vec, uint32_t ielem); 299INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
277INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a); 300INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
278 301
279INTERFACE int 302INTERFACE int
… …
305string_value (pointer p) 328string_value (pointer p)
306{ 329{
307 return strvalue (p); 330 return strvalue (p);
308} 331}
309 332
310#define ivalue_unchecked(p) (p)->object.ivalue 333#define ivalue_unchecked(p) CELL(p)->object.ivalue
311#define set_ivalue(p,v) (p)->object.ivalue = (v) 334#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
312 335
313#if USE_REAL 336#if USE_REAL
314#define rvalue_unchecked(p) (p)->object.rvalue 337#define rvalue_unchecked(p) CELL(p)->object.rvalue
315#define set_rvalue(p,v) (p)->object.rvalue = (v) 338#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
316#else 339#else
317#define rvalue_unchecked(p) (p)->object.ivalue 340#define rvalue_unchecked(p) CELL(p)->object.ivalue
318#define set_rvalue(p,v) (p)->object.ivalue = (v) 341#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
319#endif 342#endif
320 343
321INTERFACE long 344INTERFACE long
322charvalue (pointer p) 345charvalue (pointer p)
323{ 346{
324 return ivalue_unchecked (p); 347 return ivalue_unchecked (p);
325} 348}
326 349
350#define port(p) CELL(p)->object.port
351#define set_port(p,v) port(p) = (v)
327INTERFACE int 352INTERFACE int
328is_port (pointer p) 353is_port (pointer p)
329{ 354{
330 return type (p) == T_PORT; 355 return type (p) == T_PORT;
331} 356}
332 357
333INTERFACE int 358INTERFACE int
334is_inport (pointer p) 359is_inport (pointer p)
335{ 360{
336 return is_port (p) && p->object.port->kind & port_input; 361 return is_port (p) && port (p)->kind & port_input;
337} 362}
338 363
339INTERFACE int 364INTERFACE int
340is_outport (pointer p) 365is_outport (pointer p)
341{ 366{
342 return is_port (p) && p->object.port->kind & port_output; 367 return is_port (p) && port (p)->kind & port_output;
343} 368}
344 369
345INTERFACE int 370INTERFACE int
346is_pair (pointer p) 371is_pair (pointer p)
347{ 372{
348 return type (p) == T_PAIR; 373 return type (p) == T_PAIR;
349} 374}
350 375
351#define car(p) ((p)->object.cons.car + 0) 376#define car(p) (POINTER (CELL(p)->object.cons.car))
352#define cdr(p) ((p)->object.cons.cdr + 0) 377#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
353 378
354static pointer caar (pointer p) { return car (car (p)); } 379static pointer caar (pointer p) { return car (car (p)); }
355static pointer cadr (pointer p) { return car (cdr (p)); } 380static pointer cadr (pointer p) { return car (cdr (p)); }
356static pointer cdar (pointer p) { return cdr (car (p)); } 381static pointer cdar (pointer p) { return cdr (car (p)); }
357static pointer cddr (pointer p) { return cdr (cdr (p)); } 382static pointer cddr (pointer p) { return cdr (cdr (p)); }
… …
361static pointer cdaar (pointer p) { return cdr (car (car (p))); } 386static pointer cdaar (pointer p) { return cdr (car (car (p))); }
362 387
363INTERFACE void 388INTERFACE void
364set_car (pointer p, pointer q) 389set_car (pointer p, pointer q)
365{ 390{
366 p->object.cons.car = q; 391 CELL(p)->object.cons.car = CELL (q);
367} 392}
368 393
369INTERFACE void 394INTERFACE void
370set_cdr (pointer p, pointer q) 395set_cdr (pointer p, pointer q)
371{ 396{
372 p->object.cons.cdr = q; 397 CELL(p)->object.cons.cdr = CELL (q);
373} 398}
374 399
375INTERFACE pointer 400INTERFACE pointer
376pair_car (pointer p) 401pair_car (pointer p)
377{ 402{
… …
391} 416}
392 417
393INTERFACE char * 418INTERFACE char *
394symname (pointer p) 419symname (pointer p)
395{ 420{
396 return strvalue (car (p)); 421 return strvalue (p);
397} 422}
398 423
399#if USE_PLIST 424#if USE_PLIST
425#error plists are broken because symbols are no longer pairs
426#define symprop(p) cdr(p)
400SCHEME_EXPORT int 427SCHEME_EXPORT int
401hasprop (pointer p) 428hasprop (pointer p)
402{ 429{
403 return typeflag (p) & T_SYMBOL; 430 return typeflag (p) & T_SYMBOL;
404} 431}
405
406# define symprop(p) cdr(p)
407#endif 432#endif
408 433
409INTERFACE int 434INTERFACE int
410is_syntax (pointer p) 435is_syntax (pointer p)
411{ 436{
… …
425} 450}
426 451
427INTERFACE char * 452INTERFACE char *
428syntaxname (pointer p) 453syntaxname (pointer p)
429{ 454{
430 return strvalue (car (p)); 455 return strvalue (p);
431} 456}
432 457
433#define procnum(p) ivalue_unchecked (p) 458#define procnum(p) ivalue_unchecked (p)
434static const char *procname (pointer x); 459static const char *procname (pointer x);
435 460
… …
507 proper list: length 532 proper list: length
508 circular list: -1 533 circular list: -1
509 not even a pair: -2 534 not even a pair: -2
510 dotted list: -2 minus length before dot 535 dotted list: -2 minus length before dot
511*/ 536*/
512INTERFACE int 537ecb_hot INTERFACE int
513list_length (SCHEME_P_ pointer a) 538list_length (SCHEME_P_ pointer a)
514{ 539{
515 int i = 0; 540 int i = 0;
516 pointer slow, fast; 541 pointer slow, fast;
517 542
… …
556{ 581{
557 return list_length (SCHEME_A_ a) >= 0; 582 return list_length (SCHEME_A_ a) >= 0;
558} 583}
559 584
560#if USE_CHAR_CLASSIFIERS 585#if USE_CHAR_CLASSIFIERS
586
561ecb_inline int 587ecb_inline int
562Cisalpha (int c) 588Cisalpha (int c)
563{ 589{
564 return isascii (c) && isalpha (c); 590 return isascii (c) && isalpha (c);
565} 591}
… …
623 "gs", 649 "gs",
624 "rs", 650 "rs",
625 "us" 651 "us"
626}; 652};
627 653
628static int 654ecb_cold static int
629is_ascii_name (const char *name, int *pc) 655is_ascii_name (const char *name, int *pc)
630{ 656{
631 int i; 657 int i;
632 658
633 for (i = 0; i < 32; i++) 659 for (i = 0; i < 32; i++)
… …
651#endif 677#endif
652 678
653static int file_push (SCHEME_P_ const char *fname); 679static int file_push (SCHEME_P_ const char *fname);
654static void file_pop (SCHEME_P); 680static void file_pop (SCHEME_P);
655static int file_interactive (SCHEME_P); 681static int file_interactive (SCHEME_P);
656ecb_inline int is_one_of (char *s, int c); 682ecb_inline int is_one_of (const char *s, int c);
657static int alloc_cellseg (SCHEME_P_ int n); 683static int alloc_cellseg (SCHEME_P);
658ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 684ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
659static void finalize_cell (SCHEME_P_ pointer a); 685static void finalize_cell (SCHEME_P_ pointer a);
660static int count_consecutive_cells (pointer x, int needed);
661static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 686static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
662static pointer mk_number (SCHEME_P_ const num n); 687static pointer mk_number (SCHEME_P_ const num n);
663static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 688static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
664static pointer mk_vector (SCHEME_P_ uint32_t len); 689static pointer mk_vector (SCHEME_P_ uint32_t len);
665static pointer mk_atom (SCHEME_P_ char *q); 690static pointer mk_atom (SCHEME_P_ char *q);
666static pointer mk_sharp_const (SCHEME_P_ char *name); 691static pointer mk_sharp_const (SCHEME_P_ char *name);
667 692
693static pointer mk_port (SCHEME_P_ port *p);
694
668#if USE_PORTS 695#if USE_PORTS
669static pointer mk_port (SCHEME_P_ port *p);
670static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 696static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
671static pointer port_from_file (SCHEME_P_ int, int prop); 697static pointer port_from_file (SCHEME_P_ int, int prop);
672static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 698static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
673static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop); 699static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop);
674static port *port_rep_from_file (SCHEME_P_ int, int prop); 700static port *port_rep_from_file (SCHEME_P_ int, int prop);
675static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 701static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
676static void port_close (SCHEME_P_ pointer p, int flag); 702static void port_close (SCHEME_P_ pointer p, int flag);
677#endif 703#endif
704
678static void mark (pointer a); 705static void mark (pointer a);
679static void gc (SCHEME_P_ pointer a, pointer b); 706static void gc (SCHEME_P_ pointer a, pointer b);
680static int basic_inchar (port *pt); 707static int basic_inchar (port *pt);
681static int inchar (SCHEME_P); 708static int inchar (SCHEME_P);
682static void backchar (SCHEME_P_ int c); 709static void backchar (SCHEME_P_ int c);
683static char *readstr_upto (SCHEME_P_ char *delim); 710static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
684static pointer readstrexp (SCHEME_P); 711static pointer readstrexp (SCHEME_P_ char delim);
685ecb_inline int skipspace (SCHEME_P); 712static int skipspace (SCHEME_P);
686static int token (SCHEME_P); 713static int token (SCHEME_P);
687static void printslashstring (SCHEME_P_ char *s, int len); 714static void printslashstring (SCHEME_P_ char *s, int len);
688static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 715static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
689static void printatom (SCHEME_P_ pointer l, int f); 716static void printatom (SCHEME_P_ pointer l, int f);
690static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 717static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
856 } 883 }
857 884
858 return ret; 885 return ret;
859} 886}
860 887
861#if USE_MATH
862
863/* Round to nearest. Round to even if midway */
864static double
865round_per_R5RS (double x)
866{
867 double fl = floor (x);
868 double ce = ceil (x);
869 double dfl = x - fl;
870 double dce = ce - x;
871
872 if (dfl > dce)
873 return ce;
874 else if (dfl < dce)
875 return fl;
876 else
877 {
878 if (fmod (fl, 2) == 0) /* I imagine this holds */
879 return fl;
880 else
881 return ce;
882 }
883}
884#endif
885
886static int 888static int
887is_zero_rvalue (RVALUE x) 889is_zero_rvalue (RVALUE x)
888{ 890{
889 return x == 0; 891 return x == 0;
890#if 0 892#if 0
… …
895#endif 897#endif
896#endif 898#endif
897} 899}
898 900
899/* allocate new cell segment */ 901/* allocate new cell segment */
900static int 902ecb_cold static int
901alloc_cellseg (SCHEME_P_ int n) 903alloc_cellseg (SCHEME_P)
902{ 904{
903 pointer newp; 905 struct cell *newp;
904 pointer last; 906 struct cell *last;
905 pointer p; 907 struct cell *p;
906 char *cp; 908 char *cp;
907 long i; 909 long i;
908 int k; 910 int k;
909 911
910 static int segsize = CELL_SEGSIZE >> 1; 912 static int segsize = CELL_SEGSIZE >> 1;
911 segsize <<= 1; 913 segsize <<= 1;
912 914
913 for (k = 0; k < n; k++)
914 {
915 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
916 return k;
917
918 cp = malloc (segsize * sizeof (struct cell)); 915 cp = malloc (segsize * sizeof (struct cell));
919 916
920 if (!cp && USE_ERROR_CHECKING) 917 if (!cp && USE_ERROR_CHECKING)
921 return k; 918 return k;
922 919
923 i = ++SCHEME_V->last_cell_seg; 920 i = ++SCHEME_V->last_cell_seg;
924 SCHEME_V->alloc_seg[i] = cp;
925 921
926 newp = (pointer)cp; 922 newp = (struct cell *)cp;
927 SCHEME_V->cell_seg[i] = newp; 923 SCHEME_V->cell_seg[i] = newp;
928 SCHEME_V->cell_segsize[i] = segsize; 924 SCHEME_V->cell_segsize[i] = segsize;
929 SCHEME_V->fcells += segsize; 925 SCHEME_V->fcells += segsize;
930 last = newp + segsize - 1; 926 last = newp + segsize - 1;
931 927
932 for (p = newp; p <= last; p++) 928 for (p = newp; p <= last; p++)
933 { 929 {
930 pointer cp = POINTER (p);
934 set_typeflag (p, T_PAIR); 931 set_typeflag (cp, T_PAIR);
935 set_car (p, NIL); 932 set_car (cp, NIL);
936 set_cdr (p, p + 1); 933 set_cdr (cp, POINTER (p + 1));
937 } 934 }
938 935
939 set_cdr (last, SCHEME_V->free_cell); 936 set_cdr (POINTER (last), SCHEME_V->free_cell);
940 SCHEME_V->free_cell = newp; 937 SCHEME_V->free_cell = POINTER (newp);
941 }
942 938
943 return n; 939 return 1;
944} 940}
945 941
946/* get new cell. parameter a, b is marked by gc. */ 942/* get new cell. parameter a, b is marked by gc. */
947ecb_inline pointer 943ecb_inline pointer
948get_cell_x (SCHEME_P_ pointer a, pointer b) 944get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
952 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 948 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
953 return S_SINK; 949 return S_SINK;
954 950
955 if (SCHEME_V->free_cell == NIL) 951 if (SCHEME_V->free_cell == NIL)
956 { 952 {
957 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 953 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
958 954
959 gc (SCHEME_A_ a, b); 955 gc (SCHEME_A_ a, b);
960 956
961 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 957 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
962 { 958 {
963 /* if only a few recovered, get more to avoid fruitless gc's */ 959 /* if only a few recovered, get more to avoid fruitless gc's */
964 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 960 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
965 { 961 {
966#if USE_ERROR_CHECKING 962#if USE_ERROR_CHECKING
967 SCHEME_V->no_memory = 1; 963 SCHEME_V->no_memory = 1;
968 return S_SINK; 964 return S_SINK;
969#endif 965#endif
… …
981 } 977 }
982} 978}
983 979
984/* To retain recent allocs before interpreter knows about them - 980/* To retain recent allocs before interpreter knows about them -
985 Tehom */ 981 Tehom */
986 982ecb_hot static void
987static void
988push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 983push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
989{ 984{
990 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 985 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
991 986
992 set_typeflag (holder, T_PAIR); 987 set_typeflag (holder, T_PAIR);
… …
994 set_car (holder, recent); 989 set_car (holder, recent);
995 set_cdr (holder, car (S_SINK)); 990 set_cdr (holder, car (S_SINK));
996 set_car (S_SINK, holder); 991 set_car (S_SINK, holder);
997} 992}
998 993
999static pointer 994ecb_hot static pointer
1000get_cell (SCHEME_P_ pointer a, pointer b) 995get_cell (SCHEME_P_ pointer a, pointer b)
1001{ 996{
1002 pointer cell = get_cell_x (SCHEME_A_ a, b); 997 pointer cell = get_cell_x (SCHEME_A_ a, b);
1003 998
1004 /* For right now, include "a" and "b" in "cell" so that gc doesn't 999 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
1013} 1008}
1014 1009
1015static pointer 1010static pointer
1016get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1011get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1017{ 1012{
1018 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1013 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1019 pointer *e = malloc (len * sizeof (pointer)); 1014 pointer *e = malloc (len * sizeof (pointer));
1020 1015
1021 if (!e && USE_ERROR_CHECKING) 1016 if (!e && USE_ERROR_CHECKING)
1022 return S_SINK; 1017 return S_SINK;
1023 1018
1024 /* Record it as a vector so that gc understands it. */ 1019 /* Record it as a vector so that gc understands it. */
1025 set_typeflag (v, T_VECTOR | T_ATOM); 1020 set_typeflag (v, T_VECTOR | T_ATOM);
1026 1021
1027 v->object.vector.vvalue = e; 1022 CELL(v)->object.vector.vvalue = e;
1028 v->object.vector.length = len; 1023 CELL(v)->object.vector.length = len;
1029 fill_vector (v, 0, init); 1024 fill_vector (v, 0, init);
1030 push_recent_alloc (SCHEME_A_ v, NIL); 1025 push_recent_alloc (SCHEME_A_ v, NIL);
1031 1026
1032 return v; 1027 return v;
1033} 1028}
… …
1042static void 1037static void
1043check_cell_alloced (pointer p, int expect_alloced) 1038check_cell_alloced (pointer p, int expect_alloced)
1044{ 1039{
1045 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1040 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1046 if (typeflag (p) & !expect_alloced) 1041 if (typeflag (p) & !expect_alloced)
1047 xwrstr ("Cell is already allocated!\n"); 1042 putstr (SCHEME_A_ "Cell is already allocated!\n");
1048 1043
1049 if (!(typeflag (p)) & expect_alloced) 1044 if (!(typeflag (p)) & expect_alloced)
1050 xwrstr ("Cell is not allocated!\n"); 1045 putstr (SCHEME_A_ "Cell is not allocated!\n");
1051} 1046}
1052 1047
1053static void 1048static void
1054check_range_alloced (pointer p, int n, int expect_alloced) 1049check_range_alloced (pointer p, int n, int expect_alloced)
1055{ 1050{
… …
1061#endif 1056#endif
1062 1057
1063/* Medium level cell allocation */ 1058/* Medium level cell allocation */
1064 1059
1065/* get new cons cell */ 1060/* get new cons cell */
1066pointer 1061ecb_hot static pointer
1067xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1062xcons (SCHEME_P_ pointer a, pointer b)
1068{ 1063{
1069 pointer x = get_cell (SCHEME_A_ a, b); 1064 pointer x = get_cell (SCHEME_A_ a, b);
1070 1065
1071 set_typeflag (x, T_PAIR); 1066 set_typeflag (x, T_PAIR);
1072
1073 if (immutable)
1074 setimmutable (x);
1075 1067
1076 set_car (x, a); 1068 set_car (x, a);
1077 set_cdr (x, b); 1069 set_cdr (x, b);
1078 1070
1079 return x; 1071 return x;
1080} 1072}
1081 1073
1074ecb_hot static pointer
1075ximmutable_cons (SCHEME_P_ pointer a, pointer b)
1076{
1077 pointer x = xcons (SCHEME_A_ a, b);
1078 setimmutable (x);
1079 return x;
1080}
1081
1082#define cons(a,b) xcons (SCHEME_A_ a, b)
1083#define immutable_cons(a,b) ximmutable_cons (SCHEME_A_ a, b)
1084
1085ecb_cold static pointer
1086generate_symbol (SCHEME_P_ const char *name)
1087{
1088 pointer x = mk_string (SCHEME_A_ name);
1089 setimmutable (x);
1090 set_typeflag (x, T_SYMBOL | T_ATOM);
1091 return x;
1092}
1093
1082/* ========== oblist implementation ========== */ 1094/* ========== oblist implementation ========== */
1083 1095
1084#ifndef USE_OBJECT_LIST 1096#ifndef USE_OBJECT_LIST
1085 1097
1098static int
1086static int hash_fn (const char *key, int table_size); 1099hash_fn (const char *key, int table_size)
1100{
1101 const unsigned char *p = (unsigned char *)key;
1102 uint32_t hash = 2166136261;
1087 1103
1104 while (*p)
1105 hash = (hash ^ *p++) * 16777619;
1106
1107 return hash % table_size;
1108}
1109
1088static pointer 1110ecb_cold static pointer
1089oblist_initial_value (SCHEME_P) 1111oblist_initial_value (SCHEME_P)
1090{ 1112{
1091 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1113 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1092} 1114}
1093 1115
1094/* returns the new symbol */ 1116/* returns the new symbol */
1095static pointer 1117ecb_cold static pointer
1096oblist_add_by_name (SCHEME_P_ const char *name) 1118oblist_add_by_name (SCHEME_P_ const char *name)
1097{ 1119{
1098 int location; 1120 pointer x = generate_symbol (SCHEME_A_ name);
1099
1100 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1101 set_typeflag (x, T_SYMBOL);
1102 setimmutable (car (x));
1103
1104 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1121 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1105 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location))); 1122 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1106 return x; 1123 return x;
1107} 1124}
1108 1125
1109ecb_inline pointer 1126ecb_cold static pointer
1110oblist_find_by_name (SCHEME_P_ const char *name) 1127oblist_find_by_name (SCHEME_P_ const char *name)
1111{ 1128{
1112 int location; 1129 int location;
1113 pointer x; 1130 pointer x;
1114 char *s; 1131 char *s;
… …
1125 } 1142 }
1126 1143
1127 return NIL; 1144 return NIL;
1128} 1145}
1129 1146
1130static pointer 1147ecb_cold static pointer
1131oblist_all_symbols (SCHEME_P) 1148oblist_all_symbols (SCHEME_P)
1132{ 1149{
1133 int i; 1150 int i;
1134 pointer x; 1151 pointer x;
1135 pointer ob_list = NIL; 1152 pointer ob_list = NIL;
… …
1141 return ob_list; 1158 return ob_list;
1142} 1159}
1143 1160
1144#else 1161#else
1145 1162
1146static pointer 1163ecb_cold static pointer
1147oblist_initial_value (SCHEME_P) 1164oblist_initial_value (SCHEME_P)
1148{ 1165{
1149 return NIL; 1166 return NIL;
1150} 1167}
1151 1168
1152ecb_inline pointer 1169ecb_cold static pointer
1153oblist_find_by_name (SCHEME_P_ const char *name) 1170oblist_find_by_name (SCHEME_P_ const char *name)
1154{ 1171{
1155 pointer x; 1172 pointer x;
1156 char *s; 1173 char *s;
1157 1174
… …
1166 1183
1167 return NIL; 1184 return NIL;
1168} 1185}
1169 1186
1170/* returns the new symbol */ 1187/* returns the new symbol */
1171static pointer 1188ecb_cold static pointer
1172oblist_add_by_name (SCHEME_P_ const char *name) 1189oblist_add_by_name (SCHEME_P_ const char *name)
1173{ 1190{
1174 pointer x; 1191 pointer x = generate_symbol (SCHEME_A_ name);
1175
1176 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1177 set_typeflag (x, T_SYMBOL);
1178 setimmutable (car (x));
1179 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1192 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1180 return x; 1193 return x;
1181} 1194}
1182 1195
1183static pointer 1196ecb_cold static pointer
1184oblist_all_symbols (SCHEME_P) 1197oblist_all_symbols (SCHEME_P)
1185{ 1198{
1186 return SCHEME_V->oblist; 1199 return SCHEME_V->oblist;
1187} 1200}
1188 1201
1189#endif 1202#endif
1190 1203
1191#if USE_PORTS
1192static pointer 1204ecb_cold static pointer
1193mk_port (SCHEME_P_ port *p) 1205mk_port (SCHEME_P_ port *p)
1194{ 1206{
1195 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1207 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196 1208
1197 set_typeflag (x, T_PORT | T_ATOM); 1209 set_typeflag (x, T_PORT | T_ATOM);
1198 x->object.port = p; 1210 set_port (x, p);
1199 1211
1200 return x; 1212 return x;
1201} 1213}
1202#endif
1203 1214
1204pointer 1215ecb_cold pointer
1205mk_foreign_func (SCHEME_P_ foreign_func f) 1216mk_foreign_func (SCHEME_P_ foreign_func f)
1206{ 1217{
1207 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1218 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1208 1219
1209 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1220 set_typeflag (x, T_FOREIGN | T_ATOM);
1210 x->object.ff = f; 1221 CELL(x)->object.ff = f;
1211 1222
1212 return x; 1223 return x;
1213} 1224}
1214 1225
1215INTERFACE pointer 1226INTERFACE pointer
1216mk_character (SCHEME_P_ int c) 1227mk_character (SCHEME_P_ int c)
1217{ 1228{
1218 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1229 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1219 1230
1220 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1231 set_typeflag (x, T_CHARACTER | T_ATOM);
1221 set_ivalue (x, c & 0xff); 1232 set_ivalue (x, c & 0xff);
1222 1233
1223 return x; 1234 return x;
1224} 1235}
1225 1236
1226/* get number atom (integer) */ 1237/* get number atom (integer) */
1227INTERFACE pointer 1238INTERFACE pointer
1228mk_integer (SCHEME_P_ long n) 1239mk_integer (SCHEME_P_ long n)
1229{ 1240{
1241 pointer p = 0;
1242 pointer *pp = &p;
1243
1244#if USE_INTCACHE
1245 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1246 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1247#endif
1248
1249 if (!*pp)
1250 {
1230 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1251 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1231 1252
1232 set_typeflag (x, (T_INTEGER | T_ATOM)); 1253 set_typeflag (x, T_INTEGER | T_ATOM);
1254 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1233 set_ivalue (x, n); 1255 set_ivalue (x, n);
1234 1256
1257 *pp = x;
1258 }
1259
1235 return x; 1260 return *pp;
1236} 1261}
1237 1262
1238INTERFACE pointer 1263INTERFACE pointer
1239mk_real (SCHEME_P_ RVALUE n) 1264mk_real (SCHEME_P_ RVALUE n)
1240{ 1265{
1241#if USE_REAL 1266#if USE_REAL
1242 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1267 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1243 1268
1244 set_typeflag (x, (T_REAL | T_ATOM)); 1269 set_typeflag (x, T_REAL | T_ATOM);
1245 set_rvalue (x, n); 1270 set_rvalue (x, n);
1246 1271
1247 return x; 1272 return x;
1248#else 1273#else
1249 return mk_integer (SCHEME_A_ n); 1274 return mk_integer (SCHEME_A_ n);
… …
1273 SCHEME_V->no_memory = 1; 1298 SCHEME_V->no_memory = 1;
1274 return SCHEME_V->strbuff; 1299 return SCHEME_V->strbuff;
1275 } 1300 }
1276 1301
1277 if (str) 1302 if (str)
1278 { 1303 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1279 int l = strlen (str);
1280
1281 if (l > len_str)
1282 l = len_str;
1283
1284 memcpy (q, str, l);
1285 q[l] = 0;
1286 }
1287 else 1304 else
1288 {
1289 memset (q, fill, len_str); 1305 memset (q, fill, len_str);
1306
1290 q[len_str] = 0; 1307 q[len_str] = 0;
1291 }
1292 1308
1293 return q; 1309 return q;
1294} 1310}
1295 1311
1296INTERFACE pointer 1312INTERFACE pointer
… …
1310 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1326 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1311 1327
1312 set_typeflag (x, T_STRING | T_ATOM); 1328 set_typeflag (x, T_STRING | T_ATOM);
1313 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1329 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1314 strlength (x) = len; 1330 strlength (x) = len;
1331
1315 return x; 1332 return x;
1316} 1333}
1317 1334
1318INTERFACE pointer 1335INTERFACE pointer
1319mk_string (SCHEME_P_ const char *str) 1336mk_string (SCHEME_P_ const char *str)
… …
1332{ 1349{
1333 int i; 1350 int i;
1334 1351
1335 for (i = start; i < veclength (vec); i++) 1352 for (i = start; i < veclength (vec); i++)
1336 vecvalue (vec)[i] = obj; 1353 vecvalue (vec)[i] = obj;
1354}
1355
1356INTERFACE void
1357vector_resize (pointer vec, uint32_t newsize, pointer fill)
1358{
1359 uint32_t oldsize = veclength (vec);
1360 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1361 veclength (vec) = newsize;
1362 fill_vector (vec, oldsize, fill);
1337} 1363}
1338 1364
1339INTERFACE pointer 1365INTERFACE pointer
1340vector_get (pointer vec, uint32_t ielem) 1366vector_get (pointer vec, uint32_t ielem)
1341{ 1367{
… …
1359 x = oblist_add_by_name (SCHEME_A_ name); 1385 x = oblist_add_by_name (SCHEME_A_ name);
1360 1386
1361 return x; 1387 return x;
1362} 1388}
1363 1389
1364INTERFACE pointer 1390ecb_cold INTERFACE pointer
1365gensym (SCHEME_P) 1391gensym (SCHEME_P)
1366{ 1392{
1367 pointer x; 1393 pointer x;
1368
1369 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1370 {
1371 char name[40] = "gensym-"; 1394 char name[40] = "gensym-";
1372 xnum (name + 7, SCHEME_V->gensym_cnt); 1395 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1373 1396
1374 /* first check oblist */ 1397 return generate_symbol (SCHEME_A_ name);
1375 x = oblist_find_by_name (SCHEME_A_ name); 1398}
1376 1399
1377 if (x == NIL) 1400static int
1378 { 1401is_gensym (SCHEME_P_ pointer x)
1379 x = oblist_add_by_name (SCHEME_A_ name); 1402{
1380 return x; 1403 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1381 }
1382 }
1383
1384 return NIL;
1385} 1404}
1386 1405
1387/* make symbol or number atom from string */ 1406/* make symbol or number atom from string */
1388static pointer 1407ecb_cold static pointer
1389mk_atom (SCHEME_P_ char *q) 1408mk_atom (SCHEME_P_ char *q)
1390{ 1409{
1391 char c, *p; 1410 char c, *p;
1392 int has_dec_point = 0; 1411 int has_dec_point = 0;
1393 int has_fp_exp = 0; 1412 int has_fp_exp = 0;
… …
1464 1483
1465 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1484 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1466} 1485}
1467 1486
1468/* make constant */ 1487/* make constant */
1469static pointer 1488ecb_cold static pointer
1470mk_sharp_const (SCHEME_P_ char *name) 1489mk_sharp_const (SCHEME_P_ char *name)
1471{ 1490{
1472 if (!strcmp (name, "t")) 1491 if (!strcmp (name, "t"))
1473 return S_T; 1492 return S_T;
1474 else if (!strcmp (name, "f")) 1493 else if (!strcmp (name, "f"))
1475 return S_F; 1494 return S_F;
1476 else if (*name == '\\') /* #\w (character) */ 1495 else if (*name == '\\') /* #\w (character) */
1477 { 1496 {
1478 int c; 1497 int c;
1479 1498
1499 // TODO: optimise
1480 if (stricmp (name + 1, "space") == 0) 1500 if (stricmp (name + 1, "space") == 0)
1481 c = ' '; 1501 c = ' ';
1482 else if (stricmp (name + 1, "newline") == 0) 1502 else if (stricmp (name + 1, "newline") == 0)
1483 c = '\n'; 1503 c = '\n';
1484 else if (stricmp (name + 1, "return") == 0) 1504 else if (stricmp (name + 1, "return") == 0)
1485 c = '\r'; 1505 c = '\r';
1486 else if (stricmp (name + 1, "tab") == 0) 1506 else if (stricmp (name + 1, "tab") == 0)
1487 c = '\t'; 1507 c = '\t';
1508 else if (stricmp (name + 1, "alarm") == 0)
1509 c = 0x07;
1510 else if (stricmp (name + 1, "backspace") == 0)
1511 c = 0x08;
1512 else if (stricmp (name + 1, "escape") == 0)
1513 c = 0x1b;
1514 else if (stricmp (name + 1, "delete") == 0)
1515 c = 0x7f;
1516 else if (stricmp (name + 1, "null") == 0)
1517 c = 0;
1488 else if (name[1] == 'x' && name[2] != 0) 1518 else if (name[1] == 'x' && name[2] != 0)
1489 { 1519 {
1490 long c1 = strtol (name + 2, 0, 16); 1520 long c1 = strtol (name + 2, 0, 16);
1491 1521
1492 if (0 <= c1 && c1 <= UCHAR_MAX) 1522 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1517 return NIL; 1547 return NIL;
1518 } 1548 }
1519} 1549}
1520 1550
1521/* ========== garbage collector ========== */ 1551/* ========== garbage collector ========== */
1552
1553static void
1554finalize_cell (SCHEME_P_ pointer a)
1555{
1556 /* TODO, fast bitmap check? */
1557 if (is_string (a) || is_symbol (a))
1558 free (strvalue (a));
1559 else if (is_vector (a))
1560 free (vecvalue (a));
1561#if USE_PORTS
1562 else if (is_port (a))
1563 {
1564 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1565 port_close (SCHEME_A_ a, port_input | port_output);
1566
1567 free (port (a));
1568 }
1569#endif
1570}
1522 1571
1523/*-- 1572/*--
1524 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1573 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1525 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1574 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1526 * for marking. 1575 * for marking.
1527 * 1576 *
1528 * The exception is vectors - vectors are currently marked recursively, 1577 * The exception is vectors - vectors are currently marked recursively,
1529 * which is inherited form tinyscheme and could be fixed by having another 1578 * which is inherited form tinyscheme and could be fixed by having another
1530 * word of context in the vector 1579 * word of context in the vector
1531 */ 1580 */
1532static void 1581ecb_hot static void
1533mark (pointer a) 1582mark (pointer a)
1534{ 1583{
1535 pointer t, q, p; 1584 pointer t, q, p;
1536 1585
1537 t = 0; 1586 t = 0;
… …
1594 p = q; 1643 p = q;
1595 goto E6; 1644 goto E6;
1596 } 1645 }
1597} 1646}
1598 1647
1648ecb_hot static void
1649gc_free (SCHEME_P)
1650{
1651 int i;
1652 uint32_t total = 0;
1653
1654 /* Here we scan the cells to build the free-list. */
1655 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1656 {
1657 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1658 struct cell *p;
1659 total += SCHEME_V->cell_segsize [i];
1660
1661 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1662 {
1663 pointer c = POINTER (p);
1664
1665 if (is_mark (c))
1666 clrmark (c);
1667 else
1668 {
1669 /* reclaim cell */
1670 if (typeflag (c) != T_PAIR)
1671 {
1672 finalize_cell (SCHEME_A_ c);
1673 set_typeflag (c, T_PAIR);
1674 set_car (c, NIL);
1675 }
1676
1677 ++SCHEME_V->fcells;
1678 set_cdr (c, SCHEME_V->free_cell);
1679 SCHEME_V->free_cell = c;
1680 }
1681 }
1682 }
1683
1684 if (SCHEME_V->gc_verbose)
1685 {
1686 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");
1687 }
1688}
1689
1599/* garbage collection. parameter a, b is marked. */ 1690/* garbage collection. parameter a, b is marked. */
1600static void 1691ecb_cold static void
1601gc (SCHEME_P_ pointer a, pointer b) 1692gc (SCHEME_P_ pointer a, pointer b)
1602{ 1693{
1603 pointer p;
1604 int i; 1694 int i;
1605 1695
1606 if (SCHEME_V->gc_verbose) 1696 if (SCHEME_V->gc_verbose)
1607 putstr (SCHEME_A_ "gc..."); 1697 putstr (SCHEME_A_ "gc...");
1608 1698
… …
1624 /* Mark recent objects the interpreter doesn't know about yet. */ 1714 /* Mark recent objects the interpreter doesn't know about yet. */
1625 mark (car (S_SINK)); 1715 mark (car (S_SINK));
1626 /* Mark any older stuff above nested C calls */ 1716 /* Mark any older stuff above nested C calls */
1627 mark (SCHEME_V->c_nest); 1717 mark (SCHEME_V->c_nest);
1628 1718
1719#if USE_INTCACHE
1720 /* mark intcache */
1721 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1722 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1723 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1724#endif
1725
1629 /* mark variables a, b */ 1726 /* mark variables a, b */
1630 mark (a); 1727 mark (a);
1631 mark (b); 1728 mark (b);
1632 1729
1633 /* garbage collect */ 1730 /* garbage collect */
1634 clrmark (NIL); 1731 clrmark (NIL);
1635 SCHEME_V->fcells = 0; 1732 SCHEME_V->fcells = 0;
1636 SCHEME_V->free_cell = NIL; 1733 SCHEME_V->free_cell = NIL;
1637 1734
1638 /* free-list is kept sorted by address so as to maintain consecutive
1639 ranges, if possible, for use with vectors. Here we scan the cells
1640 (which are also kept sorted by address) downwards to build the
1641 free-list in sorted order.
1642 */
1643 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1644 {
1645 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1646
1647 while (--p >= SCHEME_V->cell_seg[i])
1648 {
1649 if (is_mark (p))
1650 clrmark (p);
1651 else
1652 {
1653 /* reclaim cell */
1654 if (typeflag (p) != T_PAIR)
1655 {
1656 finalize_cell (SCHEME_A_ p);
1657 set_typeflag (p, T_PAIR);
1658 set_car (p, NIL);
1659 }
1660
1661 ++SCHEME_V->fcells;
1662 set_cdr (p, SCHEME_V->free_cell);
1663 SCHEME_V->free_cell = p;
1664 }
1665 }
1666 }
1667
1668 if (SCHEME_V->gc_verbose) 1735 if (SCHEME_V->gc_verbose)
1669 { 1736 putstr (SCHEME_A_ "freeing...");
1670 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1671 }
1672}
1673 1737
1674static void 1738 gc_free (SCHEME_A);
1675finalize_cell (SCHEME_P_ pointer a)
1676{
1677 /* TODO, fast bitmap check? */
1678 if (is_string (a))
1679 free (strvalue (a));
1680 else if (is_vector (a))
1681 free (vecvalue (a));
1682#if USE_PORTS
1683 else if (is_port (a))
1684 {
1685 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1686 port_close (SCHEME_A_ a, port_input | port_output);
1687
1688 free (a->object.port);
1689 }
1690#endif
1691} 1739}
1692 1740
1693/* ========== Routines for Reading ========== */ 1741/* ========== Routines for Reading ========== */
1694 1742
1695static int 1743ecb_cold static int
1696file_push (SCHEME_P_ const char *fname) 1744file_push (SCHEME_P_ const char *fname)
1697{ 1745{
1698#if USE_PORTS
1699 int fin; 1746 int fin;
1700 1747
1701 if (SCHEME_V->file_i == MAXFIL - 1) 1748 if (SCHEME_V->file_i == MAXFIL - 1)
1702 return 0; 1749 return 0;
1703 1750
… …
1709 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1756 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1710 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1757 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1711 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1758 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1712 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1759 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1713 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1760 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1714 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1761 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1715 1762
1716#if SHOW_ERROR_LINE 1763#if SHOW_ERROR_LINE
1717 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1764 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1718 1765
1719 if (fname) 1766 if (fname)
1720 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0); 1767 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0);
1721#endif 1768#endif
1722 } 1769 }
1723 1770
1724 return fin >= 0; 1771 return fin >= 0;
1725
1726#else
1727 return 1;
1728#endif
1729} 1772}
1730 1773
1731static void 1774ecb_cold static void
1732file_pop (SCHEME_P) 1775file_pop (SCHEME_P)
1733{ 1776{
1734 if (SCHEME_V->file_i != 0) 1777 if (SCHEME_V->file_i != 0)
1735 { 1778 {
1736 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1779 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1737#if USE_PORTS 1780#if USE_PORTS
1738 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1781 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1739#endif 1782#endif
1740 SCHEME_V->file_i--; 1783 SCHEME_V->file_i--;
1741 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1784 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1742 } 1785 }
1743} 1786}
1744 1787
1745static int 1788ecb_cold static int
1746file_interactive (SCHEME_P) 1789file_interactive (SCHEME_P)
1747{ 1790{
1748#if USE_PORTS 1791#if USE_PORTS
1749 return SCHEME_V->file_i == 0 1792 return SCHEME_V->file_i == 0
1750 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1793 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1751 && (SCHEME_V->inport->object.port->kind & port_file); 1794 && (port (SCHEME_V->inport)->kind & port_file);
1752#else 1795#else
1753 return 0; 1796 return 0;
1754#endif 1797#endif
1755} 1798}
1756 1799
1757#if USE_PORTS 1800#if USE_PORTS
1758static port * 1801ecb_cold static port *
1759port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1802port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1760{ 1803{
1761 int fd; 1804 int fd;
1762 int flags; 1805 int flags;
1763 char *rw; 1806 char *rw;
… …
1786# endif 1829# endif
1787 1830
1788 return pt; 1831 return pt;
1789} 1832}
1790 1833
1791static pointer 1834ecb_cold static pointer
1792port_from_filename (SCHEME_P_ const char *fn, int prop) 1835port_from_filename (SCHEME_P_ const char *fn, int prop)
1793{ 1836{
1794 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1837 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1795 1838
1796 if (!pt && USE_ERROR_CHECKING) 1839 if (!pt && USE_ERROR_CHECKING)
1797 return NIL; 1840 return NIL;
1798 1841
1799 return mk_port (SCHEME_A_ pt); 1842 return mk_port (SCHEME_A_ pt);
1800} 1843}
1801 1844
1802static port * 1845ecb_cold static port *
1803port_rep_from_file (SCHEME_P_ int f, int prop) 1846port_rep_from_file (SCHEME_P_ int f, int prop)
1804{ 1847{
1805 port *pt = malloc (sizeof *pt); 1848 port *pt = malloc (sizeof *pt);
1806 1849
1807 if (!pt && USE_ERROR_CHECKING) 1850 if (!pt && USE_ERROR_CHECKING)
… …
1812 pt->rep.stdio.file = f; 1855 pt->rep.stdio.file = f;
1813 pt->rep.stdio.closeit = 0; 1856 pt->rep.stdio.closeit = 0;
1814 return pt; 1857 return pt;
1815} 1858}
1816 1859
1817static pointer 1860ecb_cold static pointer
1818port_from_file (SCHEME_P_ int f, int prop) 1861port_from_file (SCHEME_P_ int f, int prop)
1819{ 1862{
1820 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1863 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1821 1864
1822 if (!pt && USE_ERROR_CHECKING) 1865 if (!pt && USE_ERROR_CHECKING)
1823 return NIL; 1866 return NIL;
1824 1867
1825 return mk_port (SCHEME_A_ pt); 1868 return mk_port (SCHEME_A_ pt);
1826} 1869}
1827 1870
1828static port * 1871ecb_cold static port *
1829port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1872port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1830{ 1873{
1831 port *pt = malloc (sizeof (port)); 1874 port *pt = malloc (sizeof (port));
1832 1875
1833 if (!pt && USE_ERROR_CHECKING) 1876 if (!pt && USE_ERROR_CHECKING)
… …
1839 pt->rep.string.curr = start; 1882 pt->rep.string.curr = start;
1840 pt->rep.string.past_the_end = past_the_end; 1883 pt->rep.string.past_the_end = past_the_end;
1841 return pt; 1884 return pt;
1842} 1885}
1843 1886
1844static pointer 1887ecb_cold static pointer
1845port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1888port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1846{ 1889{
1847 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1890 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1848 1891
1849 if (!pt && USE_ERROR_CHECKING) 1892 if (!pt && USE_ERROR_CHECKING)
… …
1852 return mk_port (SCHEME_A_ pt); 1895 return mk_port (SCHEME_A_ pt);
1853} 1896}
1854 1897
1855# define BLOCK_SIZE 256 1898# define BLOCK_SIZE 256
1856 1899
1857static port * 1900ecb_cold static port *
1858port_rep_from_scratch (SCHEME_P) 1901port_rep_from_scratch (SCHEME_P)
1859{ 1902{
1860 char *start; 1903 char *start;
1861 port *pt = malloc (sizeof (port)); 1904 port *pt = malloc (sizeof (port));
1862 1905
… …
1876 pt->rep.string.curr = start; 1919 pt->rep.string.curr = start;
1877 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1920 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1878 return pt; 1921 return pt;
1879} 1922}
1880 1923
1881static pointer 1924ecb_cold static pointer
1882port_from_scratch (SCHEME_P) 1925port_from_scratch (SCHEME_P)
1883{ 1926{
1884 port *pt = port_rep_from_scratch (SCHEME_A); 1927 port *pt = port_rep_from_scratch (SCHEME_A);
1885 1928
1886 if (!pt && USE_ERROR_CHECKING) 1929 if (!pt && USE_ERROR_CHECKING)
1887 return NIL; 1930 return NIL;
1888 1931
1889 return mk_port (SCHEME_A_ pt); 1932 return mk_port (SCHEME_A_ pt);
1890} 1933}
1891 1934
1892static void 1935ecb_cold static void
1893port_close (SCHEME_P_ pointer p, int flag) 1936port_close (SCHEME_P_ pointer p, int flag)
1894{ 1937{
1895 port *pt = p->object.port; 1938 port *pt = port (p);
1896 1939
1897 pt->kind &= ~flag; 1940 pt->kind &= ~flag;
1898 1941
1899 if ((pt->kind & (port_input | port_output)) == 0) 1942 if ((pt->kind & (port_input | port_output)) == 0)
1900 { 1943 {
… …
1917 } 1960 }
1918} 1961}
1919#endif 1962#endif
1920 1963
1921/* get new character from input file */ 1964/* get new character from input file */
1922static int 1965ecb_cold static int
1923inchar (SCHEME_P) 1966inchar (SCHEME_P)
1924{ 1967{
1925 int c; 1968 int c;
1926 port *pt; 1969 port *pt = port (SCHEME_V->inport);
1927
1928 pt = SCHEME_V->inport->object.port;
1929 1970
1930 if (pt->kind & port_saw_EOF) 1971 if (pt->kind & port_saw_EOF)
1931 return EOF; 1972 return EOF;
1932 1973
1933 c = basic_inchar (pt); 1974 c = basic_inchar (pt);
… …
1943 } 1984 }
1944 1985
1945 return c; 1986 return c;
1946} 1987}
1947 1988
1948static int ungot = -1; 1989ecb_cold static int
1949
1950static int
1951basic_inchar (port *pt) 1990basic_inchar (port *pt)
1952{ 1991{
1953#if USE_PORTS
1954 if (pt->unget != -1) 1992 if (pt->unget != -1)
1955 { 1993 {
1956 int r = pt->unget; 1994 int r = pt->unget;
1957 pt->unget = -1; 1995 pt->unget = -1;
1958 return r; 1996 return r;
1959 } 1997 }
1960 1998
1999#if USE_PORTS
1961 if (pt->kind & port_file) 2000 if (pt->kind & port_file)
1962 { 2001 {
1963 char c; 2002 char c;
1964 2003
1965 if (!read (pt->rep.stdio.file, &c, 1)) 2004 if (!read (pt->rep.stdio.file, &c, 1))
… …
1973 return EOF; 2012 return EOF;
1974 else 2013 else
1975 return *pt->rep.string.curr++; 2014 return *pt->rep.string.curr++;
1976 } 2015 }
1977#else 2016#else
1978 if (ungot == -1)
1979 {
1980 char c; 2017 char c;
1981 if (!read (0, &c, 1)) 2018
2019 if (!read (pt->rep.stdio.file, &c, 1))
1982 return EOF; 2020 return EOF;
1983 2021
1984 ungot = c;
1985 }
1986
1987 {
1988 int r = ungot;
1989 ungot = -1;
1990 return r; 2022 return c;
1991 }
1992#endif 2023#endif
1993} 2024}
1994 2025
1995/* back character to input buffer */ 2026/* back character to input buffer */
1996static void 2027ecb_cold static void
1997backchar (SCHEME_P_ int c) 2028backchar (SCHEME_P_ int c)
1998{ 2029{
1999#if USE_PORTS 2030 port *pt = port (SCHEME_V->inport);
2000 port *pt;
2001 2031
2002 if (c == EOF) 2032 if (c == EOF)
2003 return; 2033 return;
2004 2034
2005 pt = SCHEME_V->inport->object.port;
2006 pt->unget = c; 2035 pt->unget = c;
2007#else
2008 if (c == EOF)
2009 return;
2010
2011 ungot = c;
2012#endif
2013} 2036}
2014 2037
2015#if USE_PORTS 2038#if USE_PORTS
2016static int 2039ecb_cold static int
2017realloc_port_string (SCHEME_P_ port *p) 2040realloc_port_string (SCHEME_P_ port *p)
2018{ 2041{
2019 char *start = p->rep.string.start; 2042 char *start = p->rep.string.start;
2020 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2043 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
2021 char *str = malloc (new_size); 2044 char *str = malloc (new_size);
… …
2034 else 2057 else
2035 return 0; 2058 return 0;
2036} 2059}
2037#endif 2060#endif
2038 2061
2039INTERFACE void 2062ecb_cold static void
2040putstr (SCHEME_P_ const char *s) 2063putchars (SCHEME_P_ const char *s, int len)
2041{ 2064{
2065 port *pt = port (SCHEME_V->outport);
2066
2042#if USE_PORTS 2067#if USE_PORTS
2043 port *pt = SCHEME_V->outport->object.port;
2044
2045 if (pt->kind & port_file)
2046 write (pt->rep.stdio.file, s, strlen (s));
2047 else
2048 for (; *s; s++)
2049 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2050 *pt->rep.string.curr++ = *s;
2051 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2052 *pt->rep.string.curr++ = *s;
2053
2054#else
2055 xwrstr (s);
2056#endif
2057}
2058
2059static void
2060putchars (SCHEME_P_ const char *s, int len)
2061{
2062#if USE_PORTS
2063 port *pt = SCHEME_V->outport->object.port;
2064
2065 if (pt->kind & port_file) 2068 if (pt->kind & port_file)
2066 write (pt->rep.stdio.file, s, len); 2069 write (pt->rep.stdio.file, s, len);
2067 else 2070 else
2068 { 2071 {
2069 for (; len; len--) 2072 for (; len; len--)
… …
2074 *pt->rep.string.curr++ = *s++; 2077 *pt->rep.string.curr++ = *s++;
2075 } 2078 }
2076 } 2079 }
2077 2080
2078#else 2081#else
2079 write (1, s, len); 2082 write (1, s, len); // output not initialised
2080#endif 2083#endif
2084}
2085
2086INTERFACE void
2087putstr (SCHEME_P_ const char *s)
2088{
2089 putchars (SCHEME_A_ s, strlen (s));
2081} 2090}
2082 2091
2083INTERFACE void 2092INTERFACE void
2084putcharacter (SCHEME_P_ int c) 2093putcharacter (SCHEME_P_ int c)
2085{ 2094{
2086#if USE_PORTS
2087 port *pt = SCHEME_V->outport->object.port;
2088
2089 if (pt->kind & port_file)
2090 {
2091 char cc = c;
2092 write (pt->rep.stdio.file, &cc, 1);
2093 }
2094 else
2095 {
2096 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2097 *pt->rep.string.curr++ = c;
2098 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2099 *pt->rep.string.curr++ = c;
2100 }
2101
2102#else
2103 char cc = c; 2095 char cc = c;
2104 write (1, &c, 1); 2096
2105#endif 2097 putchars (SCHEME_A_ &cc, 1);
2106} 2098}
2107 2099
2108/* read characters up to delimiter, but cater to character constants */ 2100/* read characters up to delimiter, but cater to character constants */
2109static char * 2101ecb_cold static char *
2110readstr_upto (SCHEME_P_ char *delim) 2102readstr_upto (SCHEME_P_ int skip, const char *delim)
2111{ 2103{
2112 char *p = SCHEME_V->strbuff; 2104 char *p = SCHEME_V->strbuff + skip;
2113 2105
2114 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2106 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
2115 2107
2116 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2108 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2117 *p = 0; 2109 *p = 0;
… …
2123 2115
2124 return SCHEME_V->strbuff; 2116 return SCHEME_V->strbuff;
2125} 2117}
2126 2118
2127/* read string expression "xxx...xxx" */ 2119/* read string expression "xxx...xxx" */
2128static pointer 2120ecb_cold static pointer
2129readstrexp (SCHEME_P) 2121readstrexp (SCHEME_P_ char delim)
2130{ 2122{
2131 char *p = SCHEME_V->strbuff; 2123 char *p = SCHEME_V->strbuff;
2132 int c; 2124 int c;
2133 int c1 = 0; 2125 int c1 = 0;
2134 enum
2135 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2126 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2136 2127
2137 for (;;) 2128 for (;;)
2138 { 2129 {
2139 c = inchar (SCHEME_A); 2130 c = inchar (SCHEME_A);
2140 2131
… …
2142 return S_F; 2133 return S_F;
2143 2134
2144 switch (state) 2135 switch (state)
2145 { 2136 {
2146 case st_ok: 2137 case st_ok:
2147 switch (c) 2138 if (ecb_expect_false (c == delim))
2148 {
2149 case '\\':
2150 state = st_bsl;
2151 break;
2152
2153 case '"':
2154 *p = 0;
2155 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2139 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2156 2140
2157 default: 2141 if (ecb_expect_false (c == '\\'))
2142 state = st_bsl;
2143 else
2158 *p++ = c; 2144 *p++ = c;
2159 break;
2160 }
2161 2145
2162 break; 2146 break;
2163 2147
2164 case st_bsl: 2148 case st_bsl:
2165 switch (c) 2149 switch (c)
… …
2174 case '7': 2158 case '7':
2175 state = st_oct1; 2159 state = st_oct1;
2176 c1 = c - '0'; 2160 c1 = c - '0';
2177 break; 2161 break;
2178 2162
2163 case 'a': *p++ = '\a'; state = st_ok; break;
2164 case 'n': *p++ = '\n'; state = st_ok; break;
2165 case 'r': *p++ = '\r'; state = st_ok; break;
2166 case 't': *p++ = '\t'; state = st_ok; break;
2167
2168 // this overshoots the minimum requirements of r7rs
2169 case ' ':
2170 case '\t':
2171 case '\r':
2172 case '\n':
2173 skipspace (SCHEME_A);
2174 state = st_ok;
2175 break;
2176
2177 //TODO: x should end in ;, not two-digit hex
2179 case 'x': 2178 case 'x':
2180 case 'X': 2179 case 'X':
2181 state = st_x1; 2180 state = st_x1;
2182 c1 = 0; 2181 c1 = 0;
2183 break; 2182 break;
2184 2183
2185 case 'n':
2186 *p++ = '\n';
2187 state = st_ok;
2188 break;
2189
2190 case 't':
2191 *p++ = '\t';
2192 state = st_ok;
2193 break;
2194
2195 case 'r':
2196 *p++ = '\r';
2197 state = st_ok;
2198 break;
2199
2200 case '"':
2201 *p++ = '"';
2202 state = st_ok;
2203 break;
2204
2205 default: 2184 default:
2206 *p++ = c; 2185 *p++ = c;
2207 state = st_ok; 2186 state = st_ok;
2208 break; 2187 break;
2209 } 2188 }
2210 2189
2211 break; 2190 break;
2212 2191
2213 case st_x1: 2192 case st_x1:
2214 case st_x2: 2193 case st_x2:
2215 c = toupper (c); 2194 c = tolower (c);
2216 2195
2217 if (c >= '0' && c <= 'F') 2196 if (c >= '0' && c <= '9')
2218 {
2219 if (c <= '9')
2220 c1 = (c1 << 4) + c - '0'; 2197 c1 = (c1 << 4) + c - '0';
2221 else 2198 else if (c >= 'a' && c <= 'f')
2222 c1 = (c1 << 4) + c - 'A' + 10; 2199 c1 = (c1 << 4) + c - 'a' + 10;
2223
2224 if (state == st_x1)
2225 state = st_x2;
2226 else
2227 {
2228 *p++ = c1;
2229 state = st_ok;
2230 }
2231 }
2232 else 2200 else
2233 return S_F; 2201 return S_F;
2202
2203 if (state == st_x1)
2204 state = st_x2;
2205 else
2206 {
2207 *p++ = c1;
2208 state = st_ok;
2209 }
2234 2210
2235 break; 2211 break;
2236 2212
2237 case st_oct1: 2213 case st_oct1:
2238 case st_oct2: 2214 case st_oct2:
… …
2242 backchar (SCHEME_A_ c); 2218 backchar (SCHEME_A_ c);
2243 state = st_ok; 2219 state = st_ok;
2244 } 2220 }
2245 else 2221 else
2246 { 2222 {
2247 if (state == st_oct2 && c1 >= 32) 2223 if (state == st_oct2 && c1 >= ' ')
2248 return S_F; 2224 return S_F;
2249 2225
2250 c1 = (c1 << 3) + (c - '0'); 2226 c1 = (c1 << 3) + (c - '0');
2251 2227
2252 if (state == st_oct1) 2228 if (state == st_oct1)
… …
2257 state = st_ok; 2233 state = st_ok;
2258 } 2234 }
2259 } 2235 }
2260 2236
2261 break; 2237 break;
2262
2263 } 2238 }
2264 } 2239 }
2265} 2240}
2266 2241
2267/* check c is in chars */ 2242/* check c is in chars */
2268ecb_inline int 2243ecb_cold int
2269is_one_of (char *s, int c) 2244is_one_of (const char *s, int c)
2270{ 2245{
2271 if (c == EOF)
2272 return 1;
2273
2274 return !!strchr (s, c); 2246 return c == EOF || !!strchr (s, c);
2275} 2247}
2276 2248
2277/* skip white characters */ 2249/* skip white characters */
2278ecb_inline int 2250ecb_cold int
2279skipspace (SCHEME_P) 2251skipspace (SCHEME_P)
2280{ 2252{
2281 int c, curr_line = 0; 2253 int c, curr_line = 0;
2282 2254
2283 do 2255 do
2284 { 2256 {
2285 c = inchar (SCHEME_A); 2257 c = inchar (SCHEME_A);
2258
2286#if SHOW_ERROR_LINE 2259#if SHOW_ERROR_LINE
2287 if (c == '\n') 2260 if (ecb_expect_false (c == '\n'))
2288 curr_line++; 2261 curr_line++;
2289#endif 2262#endif
2263
2264 if (ecb_expect_false (c == EOF))
2265 return c;
2290 } 2266 }
2291 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2267 while (is_one_of (WHITESPACE, c));
2292 2268
2293 /* record it */ 2269 /* record it */
2294#if SHOW_ERROR_LINE 2270#if SHOW_ERROR_LINE
2295 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2271 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2296 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2272 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2297#endif 2273#endif
2298 2274
2299 if (c != EOF)
2300 {
2301 backchar (SCHEME_A_ c); 2275 backchar (SCHEME_A_ c);
2302 return 1; 2276 return 1;
2303 }
2304 else
2305 return EOF;
2306} 2277}
2307 2278
2308/* get token */ 2279/* get token */
2309static int 2280ecb_cold static int
2310token (SCHEME_P) 2281token (SCHEME_P)
2311{ 2282{
2312 int c = skipspace (SCHEME_A); 2283 int c = skipspace (SCHEME_A);
2313 2284
2314 if (c == EOF) 2285 if (c == EOF)
… …
2326 return TOK_RPAREN; 2297 return TOK_RPAREN;
2327 2298
2328 case '.': 2299 case '.':
2329 c = inchar (SCHEME_A); 2300 c = inchar (SCHEME_A);
2330 2301
2331 if (is_one_of (" \n\t", c)) 2302 if (is_one_of (WHITESPACE, c))
2332 return TOK_DOT; 2303 return TOK_DOT;
2333 else 2304 else
2334 { 2305 {
2335 //TODO: ungetc twice in a row is not supported in C
2336 backchar (SCHEME_A_ c); 2306 backchar (SCHEME_A_ c);
2337 backchar (SCHEME_A_ '.');
2338 return TOK_ATOM; 2307 return TOK_DOTATOM;
2339 } 2308 }
2309
2310 case '|':
2311 return TOK_STRATOM;
2340 2312
2341 case '\'': 2313 case '\'':
2342 return TOK_QUOTE; 2314 return TOK_QUOTE;
2343 2315
2344 case ';': 2316 case ';':
… …
2411} 2383}
2412 2384
2413/* ========== Routines for Printing ========== */ 2385/* ========== Routines for Printing ========== */
2414#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2386#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2415 2387
2416static void 2388ecb_cold static void
2417printslashstring (SCHEME_P_ char *p, int len) 2389printslashstring (SCHEME_P_ char *p, int len)
2418{ 2390{
2419 int i; 2391 int i;
2420 unsigned char *s = (unsigned char *) p; 2392 unsigned char *s = (unsigned char *) p;
2421 2393
… …
2476 } 2448 }
2477 2449
2478 putcharacter (SCHEME_A_ '"'); 2450 putcharacter (SCHEME_A_ '"');
2479} 2451}
2480 2452
2481
2482/* print atoms */ 2453/* print atoms */
2483static void 2454ecb_cold static void
2484printatom (SCHEME_P_ pointer l, int f) 2455printatom (SCHEME_P_ pointer l, int f)
2485{ 2456{
2486 char *p; 2457 char *p;
2487 int len; 2458 int len;
2488 2459
2489 atom2str (SCHEME_A_ l, f, &p, &len); 2460 atom2str (SCHEME_A_ l, f, &p, &len);
2490 putchars (SCHEME_A_ p, len); 2461 putchars (SCHEME_A_ p, len);
2491} 2462}
2492 2463
2493
2494/* Uses internal buffer unless string pointer is already available */ 2464/* Uses internal buffer unless string pointer is already available */
2495static void 2465ecb_cold static void
2496atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2466atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2497{ 2467{
2498 char *p; 2468 char *p;
2499 2469
2500 if (l == NIL) 2470 if (l == NIL)
… …
2658#endif 2628#endif
2659 } 2629 }
2660 else if (is_continuation (l)) 2630 else if (is_continuation (l))
2661 p = "#<CONTINUATION>"; 2631 p = "#<CONTINUATION>";
2662 else 2632 else
2633 {
2634#if USE_PRINTF
2635 p = SCHEME_V->strbuff;
2636 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2637#else
2663 p = "#<ERROR>"; 2638 p = "#<ERROR>";
2639#endif
2640 }
2664 2641
2665 *pp = p; 2642 *pp = p;
2666 *plen = strlen (p); 2643 *plen = strlen (p);
2667} 2644}
2668 2645
… …
2700 return car (d); 2677 return car (d);
2701 2678
2702 p = cons (car (d), cdr (d)); 2679 p = cons (car (d), cdr (d));
2703 q = p; 2680 q = p;
2704 2681
2705 while (cdr (cdr (p)) != NIL) 2682 while (cddr (p) != NIL)
2706 { 2683 {
2707 d = cons (car (p), cdr (p)); 2684 d = cons (car (p), cdr (p));
2708 2685
2709 if (cdr (cdr (p)) != NIL) 2686 if (cddr (p) != NIL)
2710 p = cdr (d); 2687 p = cdr (d);
2711 } 2688 }
2712 2689
2713 set_cdr (p, car (cdr (p))); 2690 set_cdr (p, cadr (p));
2714 return q; 2691 return q;
2715} 2692}
2716 2693
2717/* reverse list -- produce new list */ 2694/* reverse list -- produce new list */
2718static pointer 2695ecb_hot static pointer
2719reverse (SCHEME_P_ pointer a) 2696reverse (SCHEME_P_ pointer a)
2720{ 2697{
2721 /* a must be checked by gc */ 2698 /* a must be checked by gc */
2722 pointer p = NIL; 2699 pointer p = NIL;
2723 2700
… …
2726 2703
2727 return p; 2704 return p;
2728} 2705}
2729 2706
2730/* reverse list --- in-place */ 2707/* reverse list --- in-place */
2731static pointer 2708ecb_hot static pointer
2732reverse_in_place (SCHEME_P_ pointer term, pointer list) 2709reverse_in_place (SCHEME_P_ pointer term, pointer list)
2733{ 2710{
2734 pointer result = term; 2711 pointer result = term;
2735 pointer p = list; 2712 pointer p = list;
2736 2713
… …
2744 2721
2745 return result; 2722 return result;
2746} 2723}
2747 2724
2748/* append list -- produce new list (in reverse order) */ 2725/* append list -- produce new list (in reverse order) */
2749static pointer 2726ecb_hot static pointer
2750revappend (SCHEME_P_ pointer a, pointer b) 2727revappend (SCHEME_P_ pointer a, pointer b)
2751{ 2728{
2752 pointer result = a; 2729 pointer result = a;
2753 pointer p = b; 2730 pointer p = b;
2754 2731
… …
2763 2740
2764 return S_F; /* signal an error */ 2741 return S_F; /* signal an error */
2765} 2742}
2766 2743
2767/* equivalence of atoms */ 2744/* equivalence of atoms */
2768int 2745ecb_hot int
2769eqv (pointer a, pointer b) 2746eqv (pointer a, pointer b)
2770{ 2747{
2771 if (is_string (a)) 2748 if (is_string (a))
2772 { 2749 {
2773 if (is_string (b)) 2750 if (is_string (b))
… …
2812/* () is #t in R5RS */ 2789/* () is #t in R5RS */
2813#define is_true(p) ((p) != S_F) 2790#define is_true(p) ((p) != S_F)
2814#define is_false(p) ((p) == S_F) 2791#define is_false(p) ((p) == S_F)
2815 2792
2816/* ========== Environment implementation ========== */ 2793/* ========== Environment implementation ========== */
2817
2818#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2819
2820static int
2821hash_fn (const char *key, int table_size)
2822{
2823 const unsigned char *p = key;
2824 uint32_t hash = 2166136261;
2825
2826 while (*p)
2827 hash = (hash ^ *p++) * 16777619;
2828
2829 return hash % table_size;
2830}
2831#endif
2832 2794
2833#ifndef USE_ALIST_ENV 2795#ifndef USE_ALIST_ENV
2834 2796
2835/* 2797/*
2836 * In this implementation, each frame of the environment may be 2798 * In this implementation, each frame of the environment may be
… …
2853 2815
2854 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2816 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2855 setenvironment (SCHEME_V->envir); 2817 setenvironment (SCHEME_V->envir);
2856} 2818}
2857 2819
2820static uint32_t
2821sym_hash (pointer sym, uint32_t size)
2822{
2823 uintptr_t ptr = (uintptr_t)sym;
2824
2825#if 0
2826 /* table size is prime, so why mix */
2827 ptr += ptr >> 32;
2828 ptr += ptr >> 16;
2829 ptr += ptr >> 8;
2830#endif
2831
2832 return ptr % size;
2833}
2834
2858ecb_inline void 2835ecb_inline void
2859new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2836new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2860{ 2837{
2861 pointer slot = immutable_cons (variable, value); 2838 pointer slot = immutable_cons (variable, value);
2862 2839
2863 if (is_vector (car (env))) 2840 if (is_vector (car (env)))
2864 { 2841 {
2865 int location = hash_fn (symname (variable), veclength (car (env))); 2842 int location = sym_hash (variable, veclength (car (env)));
2866
2867 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location))); 2843 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2868 } 2844 }
2869 else 2845 else
2870 set_car (env, immutable_cons (slot, car (env))); 2846 set_car (env, immutable_cons (slot, car (env)));
2871} 2847}
2872 2848
2873static pointer 2849ecb_hot static pointer
2874find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2850find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2875{ 2851{
2876 pointer x, y; 2852 pointer x, y;
2877 int location;
2878 2853
2879 for (x = env; x != NIL; x = cdr (x)) 2854 for (x = env; x != NIL; x = cdr (x))
2880 { 2855 {
2881 if (is_vector (car (x))) 2856 if (is_vector (car (x)))
2882 { 2857 {
2883 location = hash_fn (symname (hdl), veclength (car (x))); 2858 int location = sym_hash (hdl, veclength (car (x)));
2884 y = vector_get (car (x), location); 2859 y = vector_get (car (x), location);
2885 } 2860 }
2886 else 2861 else
2887 y = car (x); 2862 y = car (x);
2888 2863
… …
2900 return NIL; 2875 return NIL;
2901} 2876}
2902 2877
2903#else /* USE_ALIST_ENV */ 2878#else /* USE_ALIST_ENV */
2904 2879
2905ecb_inline void 2880static void
2906new_frame_in_env (SCHEME_P_ pointer old_env) 2881new_frame_in_env (SCHEME_P_ pointer old_env)
2907{ 2882{
2908 SCHEME_V->envir = immutable_cons (NIL, old_env); 2883 SCHEME_V->envir = immutable_cons (NIL, old_env);
2909 setenvironment (SCHEME_V->envir); 2884 setenvironment (SCHEME_V->envir);
2910} 2885}
2911 2886
2912ecb_inline void 2887static void
2913new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2888new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2914{ 2889{
2915 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2890 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2916} 2891}
2917 2892
2918static pointer 2893ecb_hot static pointer
2919find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2894find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2920{ 2895{
2921 pointer x, y; 2896 pointer x, y;
2922 2897
2923 for (x = env; x != NIL; x = cdr (x)) 2898 for (x = env; x != NIL; x = cdr (x))
… …
2925 for (y = car (x); y != NIL; y = cdr (y)) 2900 for (y = car (x); y != NIL; y = cdr (y))
2926 if (caar (y) == hdl) 2901 if (caar (y) == hdl)
2927 break; 2902 break;
2928 2903
2929 if (y != NIL) 2904 if (y != NIL)
2905 return car (y);
2930 break; 2906 break;
2931 2907
2932 if (!all) 2908 if (!all)
2933 return NIL; 2909 break;
2934 } 2910 }
2935
2936 if (x != NIL)
2937 return car (y);
2938 2911
2939 return NIL; 2912 return NIL;
2940} 2913}
2941 2914
2942#endif /* USE_ALIST_ENV else */ 2915#endif /* USE_ALIST_ENV else */
2943 2916
2944ecb_inline void 2917static void
2945new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2918new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2946{ 2919{
2920 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2947 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2921 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2948} 2922}
2949 2923
2950ecb_inline void 2924static void
2951set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2925set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2952{ 2926{
2953 set_cdr (slot, value); 2927 set_cdr (slot, value);
2954} 2928}
2955 2929
2956ecb_inline pointer 2930static pointer
2957slot_value_in_env (pointer slot) 2931slot_value_in_env (pointer slot)
2958{ 2932{
2959 return cdr (slot); 2933 return cdr (slot);
2960} 2934}
2961 2935
2962/* ========== Evaluation Cycle ========== */ 2936/* ========== Evaluation Cycle ========== */
2963 2937
2964static int 2938ecb_cold static int
2965xError_1 (SCHEME_P_ const char *s, pointer a) 2939xError_1 (SCHEME_P_ const char *s, pointer a)
2966{ 2940{
2967#if USE_ERROR_HOOK 2941#if USE_ERROR_HOOK
2968 pointer x; 2942 pointer x;
2969 pointer hdl = SCHEME_V->ERROR_HOOK; 2943 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3045 pointer code; 3019 pointer code;
3046}; 3020};
3047 3021
3048# define STACK_GROWTH 3 3022# define STACK_GROWTH 3
3049 3023
3050static void 3024ecb_hot static void
3051s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3025s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3052{ 3026{
3053 int nframes = (uintptr_t)SCHEME_V->dump; 3027 int nframes = (uintptr_t)SCHEME_V->dump;
3054 struct dump_stack_frame *next_frame; 3028 struct dump_stack_frame *next_frame;
3055 3029
3056 /* enough room for the next frame? */ 3030 /* enough room for the next frame? */
3057 if (nframes >= SCHEME_V->dump_size) 3031 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3058 { 3032 {
3059 SCHEME_V->dump_size += STACK_GROWTH; 3033 SCHEME_V->dump_size += STACK_GROWTH;
3060 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3034 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3061 } 3035 }
3062 3036
… …
3068 next_frame->code = code; 3042 next_frame->code = code;
3069 3043
3070 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3044 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3071} 3045}
3072 3046
3073static int 3047static ecb_hot int
3074xs_return (SCHEME_P_ pointer a) 3048xs_return (SCHEME_P_ pointer a)
3075{ 3049{
3076 int nframes = (uintptr_t)SCHEME_V->dump; 3050 int nframes = (uintptr_t)SCHEME_V->dump;
3077 struct dump_stack_frame *frame; 3051 struct dump_stack_frame *frame;
3078 3052
… …
3089 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3063 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3090 3064
3091 return 0; 3065 return 0;
3092} 3066}
3093 3067
3094ecb_inline void 3068ecb_cold void
3095dump_stack_reset (SCHEME_P) 3069dump_stack_reset (SCHEME_P)
3096{ 3070{
3097 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3071 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3098 SCHEME_V->dump = (pointer)+0; 3072 SCHEME_V->dump = (pointer)+0;
3099} 3073}
3100 3074
3101ecb_inline void 3075ecb_cold void
3102dump_stack_initialize (SCHEME_P) 3076dump_stack_initialize (SCHEME_P)
3103{ 3077{
3104 SCHEME_V->dump_size = 0; 3078 SCHEME_V->dump_size = 0;
3105 SCHEME_V->dump_base = 0; 3079 SCHEME_V->dump_base = 0;
3106 dump_stack_reset (SCHEME_A); 3080 dump_stack_reset (SCHEME_A);
3107} 3081}
3108 3082
3109static void 3083ecb_cold static void
3110dump_stack_free (SCHEME_P) 3084dump_stack_free (SCHEME_P)
3111{ 3085{
3112 free (SCHEME_V->dump_base); 3086 free (SCHEME_V->dump_base);
3113 SCHEME_V->dump_base = 0; 3087 SCHEME_V->dump_base = 0;
3114 SCHEME_V->dump = (pointer)0; 3088 SCHEME_V->dump = (pointer)0;
3115 SCHEME_V->dump_size = 0; 3089 SCHEME_V->dump_size = 0;
3116} 3090}
3117 3091
3118static void 3092ecb_cold static void
3119dump_stack_mark (SCHEME_P) 3093dump_stack_mark (SCHEME_P)
3120{ 3094{
3121 int nframes = (uintptr_t)SCHEME_V->dump; 3095 int nframes = (uintptr_t)SCHEME_V->dump;
3122 int i; 3096 int i;
3123 3097
… …
3129 mark (frame->envir); 3103 mark (frame->envir);
3130 mark (frame->code); 3104 mark (frame->code);
3131 } 3105 }
3132} 3106}
3133 3107
3134static pointer 3108ecb_cold static pointer
3135ss_get_cont (SCHEME_P) 3109ss_get_cont (SCHEME_P)
3136{ 3110{
3137 int nframes = (uintptr_t)SCHEME_V->dump; 3111 int nframes = (uintptr_t)SCHEME_V->dump;
3138 int i; 3112 int i;
3139 3113
… …
3151 } 3125 }
3152 3126
3153 return cont; 3127 return cont;
3154} 3128}
3155 3129
3156static void 3130ecb_cold static void
3157ss_set_cont (SCHEME_P_ pointer cont) 3131ss_set_cont (SCHEME_P_ pointer cont)
3158{ 3132{
3159 int i = 0; 3133 int i = 0;
3160 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3134 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3161 3135
… …
3173 SCHEME_V->dump = (pointer)(uintptr_t)i; 3147 SCHEME_V->dump = (pointer)(uintptr_t)i;
3174} 3148}
3175 3149
3176#else 3150#else
3177 3151
3178ecb_inline void 3152ecb_cold void
3179dump_stack_reset (SCHEME_P) 3153dump_stack_reset (SCHEME_P)
3180{ 3154{
3181 SCHEME_V->dump = NIL; 3155 SCHEME_V->dump = NIL;
3182} 3156}
3183 3157
3184ecb_inline void 3158ecb_cold void
3185dump_stack_initialize (SCHEME_P) 3159dump_stack_initialize (SCHEME_P)
3186{ 3160{
3187 dump_stack_reset (SCHEME_A); 3161 dump_stack_reset (SCHEME_A);
3188} 3162}
3189 3163
3190static void 3164ecb_cold static void
3191dump_stack_free (SCHEME_P) 3165dump_stack_free (SCHEME_P)
3192{ 3166{
3193 SCHEME_V->dump = NIL; 3167 SCHEME_V->dump = NIL;
3194} 3168}
3195 3169
3196static int 3170ecb_hot static int
3197xs_return (SCHEME_P_ pointer a) 3171xs_return (SCHEME_P_ pointer a)
3198{ 3172{
3199 pointer dump = SCHEME_V->dump; 3173 pointer dump = SCHEME_V->dump;
3200 3174
3201 SCHEME_V->value = a; 3175 SCHEME_V->value = a;
… …
3211 SCHEME_V->dump = dump; 3185 SCHEME_V->dump = dump;
3212 3186
3213 return 0; 3187 return 0;
3214} 3188}
3215 3189
3216static void 3190ecb_hot static void
3217s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3191s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3218{ 3192{
3219 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3193 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3220 cons (args, 3194 cons (args,
3221 cons (SCHEME_V->envir, 3195 cons (SCHEME_V->envir,
3222 cons (code, 3196 cons (code,
3223 SCHEME_V->dump)))); 3197 SCHEME_V->dump))));
3224} 3198}
3225 3199
3200ecb_cold static void
3201dump_stack_mark (SCHEME_P)
3202{
3203 mark (SCHEME_V->dump);
3204}
3205
3206ecb_cold static pointer
3207ss_get_cont (SCHEME_P)
3208{
3209 return SCHEME_V->dump;
3210}
3211
3212ecb_cold static void
3213ss_set_cont (SCHEME_P_ pointer cont)
3214{
3215 SCHEME_V->dump = cont;
3216}
3217
3218#endif
3219
3220#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3221
3222#if EXPERIMENT
3223
3224typedef void *stream[1];
3225
3226#define stream_init() { 0 }
3227
3228ecb_cold static void
3229stream_put (void **s, uint8_t byte)
3230{
3231 uint32_t *sp = *s;
3232 uint32_t size = sizeof (uint32_t) * 2;
3233 uint32_t offs = size;
3234
3235 if (ecb_expect_true (sp))
3236 {
3237 offs = sp[0];
3238 size = sp[1];
3239 }
3240
3241 if (ecb_expect_false (offs == size))
3242 {
3243 size *= 2;
3244 sp = realloc (sp, size);
3245 *s = sp;
3246 sp[1] = size;
3247
3248 }
3249
3250 ((uint8_t *)sp)[offs++] = byte;
3251 sp[0] = offs;
3252}
3253
3254#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3255#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3256#define stream_free(s) free (s[0])
3257
3258// calculates a (preferably small) integer that makes it possible to find
3259// the symbol again. if pointers were offsets into a memory area... until
3260// then, we return segment number in the low bits, and offset in the high
3261// bits
3262static uint32_t
3263symbol_id (SCHEME_P_ pointer sym)
3264{
3265 struct cell *p = CELL (sym);
3266 int i;
3267
3268 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3269 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3270 {
3271 printf ("seg %d ofs %d/%d\n",i,(p - SCHEME_V->cell_seg[i]),SCHEME_V->cell_segsize[i]);//D
3272 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3273 }
3274
3275 abort ();
3276}
3277
3226static void 3278static void
3227dump_stack_mark (SCHEME_P) 3279compile (SCHEME_P_ stream s, pointer x)
3228{ 3280{
3229 mark (SCHEME_V->dump); 3281 if (x == NIL)
3230} 3282 {
3283 stream_put (s, 0);
3284 return;
3285 }
3231 3286
3232static pointer 3287 if (is_syntax (x))
3233ss_get_cont (SCHEME_P) 3288 {
3234{ 3289 stream_put (s, 1);
3235 return SCHEME_V->dump; 3290 stream_put (s, syntaxnum (x));
3236} 3291 return;
3292 }
3237 3293
3238static void 3294 switch (type (x))
3239ss_set_cont (SCHEME_P_ pointer cont) 3295 {
3240{ 3296 case T_INTEGER:
3241 SCHEME_V->dump = cont; 3297 stream_put (s, 2);
3242} 3298 stream_put (s, 0);
3299 stream_put (s, 0);
3300 stream_put (s, 0);
3301 stream_put (s, 0);
3302 return;
3243 3303
3244#endif 3304 case T_SYMBOL:
3305 {
3306 uint32_t sym = symbol_id (SCHEME_A_ x);
3307 printf ("sym %x\n", sym);//D
3245 3308
3246#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3309 stream_put (s, 3);
3310
3311 while (sym > 0x7f)
3312 {
3313 stream_put (s, sym | 0x80);
3314 sym >>= 8;
3315 }
3316
3317 stream_put (s, sym);
3318 }
3319 return;
3320
3321 case T_PAIR:
3322 stream_put (s, 4);
3323 while (x != NIL)
3324 {
3325 compile (SCHEME_A_ s, car (x));
3326 x = cdr (x);
3327 }
3328 stream_put (s, 0xff);
3329 return;
3330
3331 default:
3332 stream_put (s, 5);
3333 stream_put (s, type (x));
3334 stream_put (s, 0);
3335 stream_put (s, 0);
3336 stream_put (s, 0);
3337 stream_put (s, 0);
3338 break;
3339 }
3340}
3247 3341
3248static int 3342static int
3343compile_closure (SCHEME_P_ pointer p)
3344{
3345 stream s = stream_init ();
3346
3347 printatom (SCHEME_A_ p, 1);//D
3348 compile (SCHEME_A_ s, car (p));
3349
3350 FILE *xxd = popen ("xxd", "we");
3351 fwrite (stream_data (s), 1, stream_size (s), xxd);
3352 fclose (xxd);
3353
3354 return stream_size (s);
3355}
3356
3357static int
3358dtree (SCHEME_P_ int indent, pointer x)
3359{
3360 int c;
3361
3362 if (is_syntax (x))
3363 {
3364 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3365 return 8 + 8;
3366 }
3367
3368 if (x == NIL)
3369 {
3370 printf ("%*sNIL\n", indent, "");
3371 return 3;
3372 }
3373
3374 switch (type (x))
3375 {
3376 case T_INTEGER:
3377 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3378 return 32+8;
3379
3380 case T_SYMBOL:
3381 printf ("%*sS<%s>\n", indent, "", symname (x));
3382 return 24+8;
3383
3384 case T_CLOSURE:
3385 printf ("%*sS<%s>\n", indent, "", "closure");
3386 dtree (SCHEME_A_ indent + 3, cdr(x));
3387 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3388
3389 case T_PAIR:
3390 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3391 c = dtree (SCHEME_A_ indent + 3, car (x));
3392 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3393 return c + 1;
3394
3395 case T_PORT:
3396 printf ("%*sS<%s>\n", indent, "", "port");
3397 return 24+8;
3398
3399 case T_VECTOR:
3400 printf ("%*sS<%s>\n", indent, "", "vector");
3401 return 24+8;
3402
3403 case T_ENVIRONMENT:
3404 printf ("%*sS<%s>\n", indent, "", "environment");
3405 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3406
3407 default:
3408 printf ("unhandled type %d\n", type (x));
3409 break;
3410 }
3411}
3412#endif
3413
3414/* syntax, eval, core, ... */
3415ecb_hot static int
3249opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3416opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3250{ 3417{
3251 pointer args = SCHEME_V->args; 3418 pointer args = SCHEME_V->args;
3252 pointer x, y; 3419 pointer x, y;
3253 3420
3254 switch (op) 3421 switch (op)
3255 { 3422 {
3423#if EXPERIMENT //D
3424 case OP_DEBUG:
3425 {
3426 uint32_t len = compile_closure (SCHEME_A_ car (args));
3427 printf ("len = %d\n", len);
3428 printf ("\n");
3429 s_return (S_T);
3430 }
3431#endif
3256 case OP_LOAD: /* load */ 3432 case OP_LOAD: /* load */
3257 if (file_interactive (SCHEME_A)) 3433 if (file_interactive (SCHEME_A))
3258 { 3434 {
3259 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3435 putstr (SCHEME_A_ "Loading ");
3260 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3436 putstr (SCHEME_A_ strvalue (car (args)));
3437 putcharacter (SCHEME_A_ '\n');
3261 } 3438 }
3262 3439
3263 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3440 if (!file_push (SCHEME_A_ strvalue (car (args))))
3264 Error_1 ("unable to open", car (args)); 3441 Error_1 ("unable to open", car (args));
3265 else 3442
3266 {
3267 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3443 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3268 s_goto (OP_T0LVL); 3444 s_goto (OP_T0LVL);
3269 }
3270 3445
3271 case OP_T0LVL: /* top level */ 3446 case OP_T0LVL: /* top level */
3272 3447
3273 /* If we reached the end of file, this loop is done. */ 3448 /* If we reached the end of file, this loop is done. */
3274 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3449 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3275 { 3450 {
3276 if (SCHEME_V->file_i == 0) 3451 if (SCHEME_V->file_i == 0)
3277 { 3452 {
3278 SCHEME_V->args = NIL; 3453 SCHEME_V->args = NIL;
3279 s_goto (OP_QUIT); 3454 s_goto (OP_QUIT);
… …
3290 /* If interactive, be nice to user. */ 3465 /* If interactive, be nice to user. */
3291 if (file_interactive (SCHEME_A)) 3466 if (file_interactive (SCHEME_A))
3292 { 3467 {
3293 SCHEME_V->envir = SCHEME_V->global_env; 3468 SCHEME_V->envir = SCHEME_V->global_env;
3294 dump_stack_reset (SCHEME_A); 3469 dump_stack_reset (SCHEME_A);
3295 putstr (SCHEME_A_ "\n"); 3470 putcharacter (SCHEME_A_ '\n');
3296 putstr (SCHEME_A_ prompt); 3471 putstr (SCHEME_A_ prompt);
3297 } 3472 }
3298 3473
3299 /* Set up another iteration of REPL */ 3474 /* Set up another iteration of REPL */
3300 SCHEME_V->nesting = 0; 3475 SCHEME_V->nesting = 0;
… …
3335 { 3510 {
3336 SCHEME_V->print_flag = 1; 3511 SCHEME_V->print_flag = 1;
3337 SCHEME_V->args = SCHEME_V->value; 3512 SCHEME_V->args = SCHEME_V->value;
3338 s_goto (OP_P0LIST); 3513 s_goto (OP_P0LIST);
3339 } 3514 }
3340 else 3515
3341 s_return (SCHEME_V->value); 3516 s_return (SCHEME_V->value);
3342 3517
3343 case OP_EVAL: /* main part of evaluation */ 3518 case OP_EVAL: /* main part of evaluation */
3344#if USE_TRACING 3519#if USE_TRACING
3345 if (SCHEME_V->tracing) 3520 if (SCHEME_V->tracing)
3346 { 3521 {
… …
3357#endif 3532#endif
3358 if (is_symbol (SCHEME_V->code)) /* symbol */ 3533 if (is_symbol (SCHEME_V->code)) /* symbol */
3359 { 3534 {
3360 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3535 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3361 3536
3362 if (x != NIL) 3537 if (x == NIL)
3363 s_return (slot_value_in_env (x));
3364 else
3365 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3538 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3539
3540 s_return (slot_value_in_env (x));
3366 } 3541 }
3367 else if (is_pair (SCHEME_V->code)) 3542 else if (is_pair (SCHEME_V->code))
3368 { 3543 {
3369 x = car (SCHEME_V->code); 3544 x = car (SCHEME_V->code);
3370 3545
… …
3379 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3554 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3380 SCHEME_V->code = x; 3555 SCHEME_V->code = x;
3381 s_goto (OP_EVAL); 3556 s_goto (OP_EVAL);
3382 } 3557 }
3383 } 3558 }
3384 else 3559
3385 s_return (SCHEME_V->code); 3560 s_return (SCHEME_V->code);
3386 3561
3387 case OP_E0ARGS: /* eval arguments */ 3562 case OP_E0ARGS: /* eval arguments */
3388 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3563 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3389 { 3564 {
3390 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3565 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3391 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3566 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3392 SCHEME_V->code = SCHEME_V->value; 3567 SCHEME_V->code = SCHEME_V->value;
3393 s_goto (OP_APPLY); 3568 s_goto (OP_APPLY);
… …
3447 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3622 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3448 else if (is_foreign (SCHEME_V->code)) 3623 else if (is_foreign (SCHEME_V->code))
3449 { 3624 {
3450 /* Keep nested calls from GC'ing the arglist */ 3625 /* Keep nested calls from GC'ing the arglist */
3451 push_recent_alloc (SCHEME_A_ args, NIL); 3626 push_recent_alloc (SCHEME_A_ args, NIL);
3452 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3627 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3453 3628
3454 s_return (x); 3629 s_return (x);
3455 } 3630 }
3456 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3631 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3457 { 3632 {
… …
3494 3669
3495 case OP_DOMACRO: /* do macro */ 3670 case OP_DOMACRO: /* do macro */
3496 SCHEME_V->code = SCHEME_V->value; 3671 SCHEME_V->code = SCHEME_V->value;
3497 s_goto (OP_EVAL); 3672 s_goto (OP_EVAL);
3498 3673
3499#if 1
3500
3501 case OP_LAMBDA: /* lambda */ 3674 case OP_LAMBDA: /* lambda */
3502 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3675 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3503 set SCHEME_V->value fall thru */ 3676 set SCHEME_V->value fall thru */
3504 { 3677 {
3505 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3678 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
… …
3511 SCHEME_V->code = slot_value_in_env (f); 3684 SCHEME_V->code = slot_value_in_env (f);
3512 s_goto (OP_APPLY); 3685 s_goto (OP_APPLY);
3513 } 3686 }
3514 3687
3515 SCHEME_V->value = SCHEME_V->code; 3688 SCHEME_V->value = SCHEME_V->code;
3516 /* Fallthru */
3517 } 3689 }
3690 /* Fallthru */
3518 3691
3519 case OP_LAMBDA1: 3692 case OP_LAMBDA1:
3520 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3693 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3521
3522#else
3523
3524 case OP_LAMBDA: /* lambda */
3525 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3526
3527#endif
3528 3694
3529 case OP_MKCLOSURE: /* make-closure */ 3695 case OP_MKCLOSURE: /* make-closure */
3530 x = car (args); 3696 x = car (args);
3531 3697
3532 if (car (x) == SCHEME_V->LAMBDA) 3698 if (car (x) == SCHEME_V->LAMBDA)
… …
3571 else 3737 else
3572 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3738 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3573 3739
3574 s_return (SCHEME_V->code); 3740 s_return (SCHEME_V->code);
3575 3741
3576
3577 case OP_DEFP: /* defined? */ 3742 case OP_DEFP: /* defined? */
3578 x = SCHEME_V->envir; 3743 x = SCHEME_V->envir;
3579 3744
3580 if (cdr (args) != NIL) 3745 if (cdr (args) != NIL)
3581 x = cadr (args); 3746 x = cadr (args);
… …
3598 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value); 3763 set_slot_in_env (SCHEME_A_ y, SCHEME_V->value);
3599 s_return (SCHEME_V->value); 3764 s_return (SCHEME_V->value);
3600 } 3765 }
3601 else 3766 else
3602 Error_1 ("set!: unbound variable:", SCHEME_V->code); 3767 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3603
3604 3768
3605 case OP_BEGIN: /* begin */ 3769 case OP_BEGIN: /* begin */
3606 if (!is_pair (SCHEME_V->code)) 3770 if (!is_pair (SCHEME_V->code))
3607 s_return (SCHEME_V->code); 3771 s_return (SCHEME_V->code);
3608 3772
… …
3620 case OP_IF1: /* if */ 3784 case OP_IF1: /* if */
3621 if (is_true (SCHEME_V->value)) 3785 if (is_true (SCHEME_V->value))
3622 SCHEME_V->code = car (SCHEME_V->code); 3786 SCHEME_V->code = car (SCHEME_V->code);
3623 else 3787 else
3624 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 3788 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
3789
3625 s_goto (OP_EVAL); 3790 s_goto (OP_EVAL);
3626 3791
3627 case OP_LET0: /* let */ 3792 case OP_LET0: /* let */
3628 SCHEME_V->args = NIL; 3793 SCHEME_V->args = NIL;
3629 SCHEME_V->value = SCHEME_V->code; 3794 SCHEME_V->value = SCHEME_V->code;
… …
3785 } 3950 }
3786 else 3951 else
3787 { 3952 {
3788 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 3953 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3789 s_return (NIL); 3954 s_return (NIL);
3790 else 3955
3791 {
3792 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 3956 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3793 SCHEME_V->code = caar (SCHEME_V->code); 3957 SCHEME_V->code = caar (SCHEME_V->code);
3794 s_goto (OP_EVAL); 3958 s_goto (OP_EVAL);
3795 }
3796 } 3959 }
3797 3960
3798 case OP_DELAY: /* delay */ 3961 case OP_DELAY: /* delay */
3799 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 3962 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3800 set_typeflag (x, T_PROMISE); 3963 set_typeflag (x, T_PROMISE);
… …
3811 case OP_AND1: /* and */ 3974 case OP_AND1: /* and */
3812 if (is_false (SCHEME_V->value)) 3975 if (is_false (SCHEME_V->value))
3813 s_return (SCHEME_V->value); 3976 s_return (SCHEME_V->value);
3814 else if (SCHEME_V->code == NIL) 3977 else if (SCHEME_V->code == NIL)
3815 s_return (SCHEME_V->value); 3978 s_return (SCHEME_V->value);
3816 else 3979
3817 {
3818 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 3980 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3819 SCHEME_V->code = car (SCHEME_V->code); 3981 SCHEME_V->code = car (SCHEME_V->code);
3820 s_goto (OP_EVAL); 3982 s_goto (OP_EVAL);
3821 }
3822 3983
3823 case OP_OR0: /* or */ 3984 case OP_OR0: /* or */
3824 if (SCHEME_V->code == NIL) 3985 if (SCHEME_V->code == NIL)
3825 s_return (S_F); 3986 s_return (S_F);
3826 3987
… …
3831 case OP_OR1: /* or */ 3992 case OP_OR1: /* or */
3832 if (is_true (SCHEME_V->value)) 3993 if (is_true (SCHEME_V->value))
3833 s_return (SCHEME_V->value); 3994 s_return (SCHEME_V->value);
3834 else if (SCHEME_V->code == NIL) 3995 else if (SCHEME_V->code == NIL)
3835 s_return (SCHEME_V->value); 3996 s_return (SCHEME_V->value);
3836 else 3997
3837 {
3838 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 3998 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3839 SCHEME_V->code = car (SCHEME_V->code); 3999 SCHEME_V->code = car (SCHEME_V->code);
3840 s_goto (OP_EVAL); 4000 s_goto (OP_EVAL);
3841 }
3842 4001
3843 case OP_C0STREAM: /* cons-stream */ 4002 case OP_C0STREAM: /* cons-stream */
3844 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4003 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3845 SCHEME_V->code = car (SCHEME_V->code); 4004 SCHEME_V->code = car (SCHEME_V->code);
3846 s_goto (OP_EVAL); 4005 s_goto (OP_EVAL);
… …
3911 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4070 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3912 SCHEME_V->code = caar (x); 4071 SCHEME_V->code = caar (x);
3913 s_goto (OP_EVAL); 4072 s_goto (OP_EVAL);
3914 } 4073 }
3915 } 4074 }
3916 else 4075
3917 s_return (NIL); 4076 s_return (NIL);
3918 4077
3919 case OP_CASE2: /* case */ 4078 case OP_CASE2: /* case */
3920 if (is_true (SCHEME_V->value)) 4079 if (is_true (SCHEME_V->value))
3921 s_goto (OP_BEGIN); 4080 s_goto (OP_BEGIN);
3922 else 4081
3923 s_return (NIL); 4082 s_return (NIL);
3924 4083
3925 case OP_PAPPLY: /* apply */ 4084 case OP_PAPPLY: /* apply */
3926 SCHEME_V->code = car (args); 4085 SCHEME_V->code = car (args);
3927 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4086 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3928 /*SCHEME_V->args = cadr(args); */ 4087 /*SCHEME_V->args = cadr(args); */
… …
3942 } 4101 }
3943 4102
3944 if (USE_ERROR_CHECKING) abort (); 4103 if (USE_ERROR_CHECKING) abort ();
3945} 4104}
3946 4105
3947static int 4106/* math, cxr */
4107ecb_hot static int
3948opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4108opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3949{ 4109{
3950 pointer args = SCHEME_V->args; 4110 pointer args = SCHEME_V->args;
3951 pointer x = car (args); 4111 pointer x = car (args);
3952 num v; 4112 num v;
3953 4113
3954 switch (op) 4114 switch (op)
3955 { 4115 {
3956#if USE_MATH 4116#if USE_MATH
3957 case OP_INEX2EX: /* inexact->exact */ 4117 case OP_INEX2EX: /* inexact->exact */
3958 {
3959 if (is_integer (x)) 4118 if (!is_integer (x))
3960 s_return (x); 4119 {
3961
3962 RVALUE r = rvalue_unchecked (x); 4120 RVALUE r = rvalue_unchecked (x);
3963 4121
3964 if (r == (RVALUE)(IVALUE)r) 4122 if (r == (RVALUE)(IVALUE)r)
3965 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4123 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3966 else 4124 else
3967 Error_1 ("inexact->exact: not integral:", x); 4125 Error_1 ("inexact->exact: not integral:", x);
3968 } 4126 }
3969 4127
4128 s_return (x);
4129
4130 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4131 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4132 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4133 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4134
4135 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3970 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4136 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3971 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4137 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4138 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
3972 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4139 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3973 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4140 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3974 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4141 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3975 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4142 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3976 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4143 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3977 4144
3978 case OP_ATAN: 4145 case OP_ATAN:
4146 s_return (mk_real (SCHEME_A_
3979 if (cdr (args) == NIL) 4147 cdr (args) == NIL
3980 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4148 ? atan (rvalue (x))
3981 else 4149 : atan2 (rvalue (x), rvalue (cadr (args)))));
3982 {
3983 pointer y = cadr (args);
3984 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3985 }
3986
3987 case OP_SQRT:
3988 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3989 4150
3990 case OP_EXPT: 4151 case OP_EXPT:
3991 { 4152 {
3992 RVALUE result; 4153 RVALUE result;
3993 int real_result = 1; 4154 int real_result = 1;
… …
4016 if (real_result) 4177 if (real_result)
4017 s_return (mk_real (SCHEME_A_ result)); 4178 s_return (mk_real (SCHEME_A_ result));
4018 else 4179 else
4019 s_return (mk_integer (SCHEME_A_ result)); 4180 s_return (mk_integer (SCHEME_A_ result));
4020 } 4181 }
4021
4022 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4023 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4024
4025 case OP_TRUNCATE:
4026 {
4027 RVALUE n = rvalue (x);
4028 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4029 }
4030
4031 case OP_ROUND:
4032 if (is_integer (x))
4033 s_return (x);
4034
4035 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4036#endif 4182#endif
4037 4183
4038 case OP_ADD: /* + */ 4184 case OP_ADD: /* + */
4039 v = num_zero; 4185 v = num_zero;
4040 4186
… …
4128 else 4274 else
4129 Error_0 ("modulo: division by zero"); 4275 Error_0 ("modulo: division by zero");
4130 4276
4131 s_return (mk_number (SCHEME_A_ v)); 4277 s_return (mk_number (SCHEME_A_ v));
4132 4278
4133 case OP_CAR: /* car */ 4279 /* the compiler will optimize this mess... */
4134 s_return (caar (args)); 4280 case OP_CAR: op_car: s_return (car (x));
4135 4281 case OP_CDR: op_cdr: s_return (cdr (x));
4136 case OP_CDR: /* cdr */ 4282 case OP_CAAR: op_caar: x = car (x); goto op_car;
4137 s_return (cdar (args)); 4283 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4284 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4285 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4286 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4287 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4288 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4289 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4290 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4291 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4292 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4293 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4294 case OP_CAAAAR: x = car (x); goto op_caaar;
4295 case OP_CAAADR: x = cdr (x); goto op_caaar;
4296 case OP_CAADAR: x = car (x); goto op_caadr;
4297 case OP_CAADDR: x = cdr (x); goto op_caadr;
4298 case OP_CADAAR: x = car (x); goto op_cadar;
4299 case OP_CADADR: x = cdr (x); goto op_cadar;
4300 case OP_CADDAR: x = car (x); goto op_caddr;
4301 case OP_CADDDR: x = cdr (x); goto op_caddr;
4302 case OP_CDAAAR: x = car (x); goto op_cdaar;
4303 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4304 case OP_CDADAR: x = car (x); goto op_cdadr;
4305 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4306 case OP_CDDAAR: x = car (x); goto op_cddar;
4307 case OP_CDDADR: x = cdr (x); goto op_cddar;
4308 case OP_CDDDAR: x = car (x); goto op_cdddr;
4309 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4138 4310
4139 case OP_CONS: /* cons */ 4311 case OP_CONS: /* cons */
4140 set_cdr (args, cadr (args)); 4312 set_cdr (args, cadr (args));
4141 s_return (args); 4313 s_return (args);
4142 4314
… …
4316 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4488 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4317 4489
4318 s_return (newstr); 4490 s_return (newstr);
4319 } 4491 }
4320 4492
4321 case OP_SUBSTR: /* substring */ 4493 case OP_STRING_COPY: /* substring/string-copy */
4322 { 4494 {
4323 char *str = strvalue (x); 4495 char *str = strvalue (x);
4324 int index0 = ivalue_unchecked (cadr (args)); 4496 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4325 int index1; 4497 int index1;
4326 int len; 4498 int len;
4327 4499
4328 if (index0 > strlength (x)) 4500 if (index0 > strlength (x))
4329 Error_1 ("substring: start out of bounds:", cadr (args)); 4501 Error_1 ("string->copy: start out of bounds:", cadr (args));
4330 4502
4331 if (cddr (args) != NIL) 4503 if (cddr (args) != NIL)
4332 { 4504 {
4333 index1 = ivalue_unchecked (caddr (args)); 4505 index1 = ivalue_unchecked (caddr (args));
4334 4506
4335 if (index1 > strlength (x) || index1 < index0) 4507 if (index1 > strlength (x) || index1 < index0)
4336 Error_1 ("substring: end out of bounds:", caddr (args)); 4508 Error_1 ("string->copy: end out of bounds:", caddr (args));
4337 } 4509 }
4338 else 4510 else
4339 index1 = strlength (x); 4511 index1 = strlength (x);
4340 4512
4341 len = index1 - index0; 4513 len = index1 - index0;
4342 x = mk_empty_string (SCHEME_A_ len, ' '); 4514 x = mk_counted_string (SCHEME_A_ str + index0, len);
4343 memcpy (strvalue (x), str + index0, len);
4344 strvalue (x)[len] = 0;
4345 4515
4346 s_return (x); 4516 s_return (x);
4347 } 4517 }
4348 4518
4349 case OP_VECTOR: /* vector */ 4519 case OP_VECTOR: /* vector */
… …
4391 } 4561 }
4392 4562
4393 case OP_VECLEN: /* vector-length */ 4563 case OP_VECLEN: /* vector-length */
4394 s_return (mk_integer (SCHEME_A_ veclength (x))); 4564 s_return (mk_integer (SCHEME_A_ veclength (x)));
4395 4565
4566 case OP_VECRESIZE:
4567 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4568 s_return (x);
4569
4396 case OP_VECREF: /* vector-ref */ 4570 case OP_VECREF: /* vector-ref */
4397 { 4571 {
4398 int index = ivalue_unchecked (cadr (args)); 4572 int index = ivalue_unchecked (cadr (args));
4399 4573
4400 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4574 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
… …
4419 } 4593 }
4420 4594
4421 if (USE_ERROR_CHECKING) abort (); 4595 if (USE_ERROR_CHECKING) abort ();
4422} 4596}
4423 4597
4424static int 4598/* relational ops */
4599ecb_hot static int
4425opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4600opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4426{ 4601{
4427 pointer x = SCHEME_V->args; 4602 pointer x = SCHEME_V->args;
4428 4603
4429 for (;;) 4604 for (;;)
… …
4450 } 4625 }
4451 4626
4452 s_return (S_T); 4627 s_return (S_T);
4453} 4628}
4454 4629
4455static int 4630/* predicates */
4631ecb_hot static int
4456opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4632opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4457{ 4633{
4458 pointer args = SCHEME_V->args; 4634 pointer args = SCHEME_V->args;
4459 pointer a = car (args); 4635 pointer a = car (args);
4460 pointer d = cdr (args); 4636 pointer d = cdr (args);
4461 int r; 4637 int r;
4462 4638
4463 switch (op) 4639 switch (op)
4464 { 4640 {
4465 case OP_NOT: /* not */ r = is_false (a) ; break; 4641 case OP_NOT: /* not */ r = is_false (a) ; break;
4466 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4642 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4467 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4643 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4468 case OP_NULLP: /* null? */ r = a == NIL ; break; 4644 case OP_NULLP: /* null? */ r = a == NIL ; break;
4469 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4645 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4646 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4470 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4647 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4471 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4648 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4472 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4649 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4473 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4650 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4474 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4651 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4475 4652
4476#if USE_CHAR_CLASSIFIERS 4653#if USE_CHAR_CLASSIFIERS
4477 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4654 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4478 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4655 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4479 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4656 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
… …
4506 } 4683 }
4507 4684
4508 s_retbool (r); 4685 s_retbool (r);
4509} 4686}
4510 4687
4511static int 4688/* promises, list ops, ports */
4689ecb_hot static int
4512opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4690opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4513{ 4691{
4514 pointer args = SCHEME_V->args; 4692 pointer args = SCHEME_V->args;
4515 pointer a = car (args); 4693 pointer a = car (args);
4516 pointer x, y; 4694 pointer x, y;
… …
4529 } 4707 }
4530 else 4708 else
4531 s_return (SCHEME_V->code); 4709 s_return (SCHEME_V->code);
4532 4710
4533 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4711 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4534 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4712 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4535 s_return (SCHEME_V->value); 4713 s_return (SCHEME_V->value);
4536 4714
4537#if USE_PORTS 4715#if USE_PORTS
4716
4717 case OP_EOF_OBJECT: /* eof-object */
4718 s_return (S_EOF);
4538 4719
4539 case OP_WRITE: /* write */ 4720 case OP_WRITE: /* write */
4540 case OP_DISPLAY: /* display */ 4721 case OP_DISPLAY: /* display */
4541 case OP_WRITE_CHAR: /* write-char */ 4722 case OP_WRITE_CHAR: /* write-char */
4542 if (is_pair (cdr (SCHEME_V->args))) 4723 if (is_pair (cdr (SCHEME_V->args)))
… …
4556 else 4737 else
4557 SCHEME_V->print_flag = 0; 4738 SCHEME_V->print_flag = 0;
4558 4739
4559 s_goto (OP_P0LIST); 4740 s_goto (OP_P0LIST);
4560 4741
4742 //TODO: move to scheme
4561 case OP_NEWLINE: /* newline */ 4743 case OP_NEWLINE: /* newline */
4562 if (is_pair (args)) 4744 if (is_pair (args))
4563 { 4745 {
4564 if (a != SCHEME_V->outport) 4746 if (a != SCHEME_V->outport)
4565 { 4747 {
… …
4567 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4749 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4568 SCHEME_V->outport = a; 4750 SCHEME_V->outport = a;
4569 } 4751 }
4570 } 4752 }
4571 4753
4572 putstr (SCHEME_A_ "\n"); 4754 putcharacter (SCHEME_A_ '\n');
4573 s_return (S_T); 4755 s_return (S_T);
4574#endif 4756#endif
4575 4757
4576 case OP_ERR0: /* error */ 4758 case OP_ERR0: /* error */
4577 SCHEME_V->retcode = -1; 4759 SCHEME_V->retcode = -1;
… …
4586 putstr (SCHEME_A_ strvalue (car (args))); 4768 putstr (SCHEME_A_ strvalue (car (args)));
4587 SCHEME_V->args = cdr (args); 4769 SCHEME_V->args = cdr (args);
4588 s_goto (OP_ERR1); 4770 s_goto (OP_ERR1);
4589 4771
4590 case OP_ERR1: /* error */ 4772 case OP_ERR1: /* error */
4591 putstr (SCHEME_A_ " "); 4773 putcharacter (SCHEME_A_ ' ');
4592 4774
4593 if (args != NIL) 4775 if (args != NIL)
4594 { 4776 {
4595 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 4777 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4596 SCHEME_V->args = a; 4778 SCHEME_V->args = a;
4597 SCHEME_V->print_flag = 1; 4779 SCHEME_V->print_flag = 1;
4598 s_goto (OP_P0LIST); 4780 s_goto (OP_P0LIST);
4599 } 4781 }
4600 else 4782 else
4601 { 4783 {
4602 putstr (SCHEME_A_ "\n"); 4784 putcharacter (SCHEME_A_ '\n');
4603 4785
4604 if (SCHEME_V->interactive_repl) 4786 if (SCHEME_V->interactive_repl)
4605 s_goto (OP_T0LVL); 4787 s_goto (OP_T0LVL);
4606 else 4788 else
4607 return -1; 4789 return -1;
… …
4684 SCHEME_V->gc_verbose = (a != S_F); 4866 SCHEME_V->gc_verbose = (a != S_F);
4685 s_retbool (was); 4867 s_retbool (was);
4686 } 4868 }
4687 4869
4688 case OP_NEWSEGMENT: /* new-segment */ 4870 case OP_NEWSEGMENT: /* new-segment */
4871#if 0
4689 if (!is_pair (args) || !is_number (a)) 4872 if (!is_pair (args) || !is_number (a))
4690 Error_0 ("new-segment: argument must be a number"); 4873 Error_0 ("new-segment: argument must be a number");
4691 4874#endif
4692 alloc_cellseg (SCHEME_A_ ivalue (a)); 4875 s_retbool (alloc_cellseg (SCHEME_A));
4693
4694 s_return (S_T);
4695 4876
4696 case OP_OBLIST: /* oblist */ 4877 case OP_OBLIST: /* oblist */
4697 s_return (oblist_all_symbols (SCHEME_A)); 4878 s_return (oblist_all_symbols (SCHEME_A));
4698 4879
4699#if USE_PORTS 4880#if USE_PORTS
… …
4769 s_return (p == NIL ? S_F : p); 4950 s_return (p == NIL ? S_F : p);
4770 } 4951 }
4771 4952
4772 case OP_GET_OUTSTRING: /* get-output-string */ 4953 case OP_GET_OUTSTRING: /* get-output-string */
4773 { 4954 {
4774 port *p; 4955 port *p = port (a);
4775 4956
4776 if ((p = a->object.port)->kind & port_string) 4957 if (p->kind & port_string)
4777 { 4958 {
4778 off_t size; 4959 off_t size;
4779 char *str; 4960 char *str;
4780 4961
4781 size = p->rep.string.curr - p->rep.string.start + 1; 4962 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4816 } 4997 }
4817 4998
4818 if (USE_ERROR_CHECKING) abort (); 4999 if (USE_ERROR_CHECKING) abort ();
4819} 5000}
4820 5001
4821static int 5002/* reading */
5003ecb_cold static int
4822opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5004opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4823{ 5005{
4824 pointer args = SCHEME_V->args; 5006 pointer args = SCHEME_V->args;
4825 pointer x; 5007 pointer x;
4826 5008
… …
4886 int res; 5068 int res;
4887 5069
4888 if (is_pair (args)) 5070 if (is_pair (args))
4889 p = car (args); 5071 p = car (args);
4890 5072
4891 res = p->object.port->kind & port_string; 5073 res = port (p)->kind & port_string;
4892 5074
4893 s_retbool (res); 5075 s_retbool (res);
4894 } 5076 }
4895 5077
4896 case OP_SET_INPORT: /* set-input-port */ 5078 case OP_SET_INPORT: /* set-input-port */
… …
4955 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5137 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
4956 SCHEME_V->tok = token (SCHEME_A); 5138 SCHEME_V->tok = token (SCHEME_A);
4957 s_goto (OP_RDSEXPR); 5139 s_goto (OP_RDSEXPR);
4958 5140
4959 case TOK_ATOM: 5141 case TOK_ATOM:
4960 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5142 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5143
5144 case TOK_DOTATOM:
5145 SCHEME_V->strbuff[0] = '.';
5146 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5147
5148 case TOK_STRATOM:
5149 x = readstrexp (SCHEME_A_ '|');
5150 //TODO: haven't checked whether the garbage collector could interfere
5151 s_return (mk_atom (SCHEME_A_ strvalue (x)));
4961 5152
4962 case TOK_DQUOTE: 5153 case TOK_DQUOTE:
4963 x = readstrexp (SCHEME_A); 5154 x = readstrexp (SCHEME_A_ '"');
4964 5155
4965 if (x == S_F) 5156 if (x == S_F)
4966 Error_0 ("Error reading string"); 5157 Error_0 ("Error reading string");
4967 5158
4968 setimmutable (x); 5159 setimmutable (x);
… …
4980 s_goto (OP_EVAL); 5171 s_goto (OP_EVAL);
4981 } 5172 }
4982 } 5173 }
4983 5174
4984 case TOK_SHARP_CONST: 5175 case TOK_SHARP_CONST:
4985 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5176 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
4986 Error_0 ("undefined sharp expression"); 5177 Error_0 ("undefined sharp expression");
4987 else 5178 else
4988 s_return (x); 5179 s_return (x);
4989 5180
4990 default: 5181 default:
… …
5086 pointer b = cdr (args); 5277 pointer b = cdr (args);
5087 int ok_abbr = ok_abbrev (b); 5278 int ok_abbr = ok_abbrev (b);
5088 SCHEME_V->args = car (b); 5279 SCHEME_V->args = car (b);
5089 5280
5090 if (a == SCHEME_V->QUOTE && ok_abbr) 5281 if (a == SCHEME_V->QUOTE && ok_abbr)
5091 putstr (SCHEME_A_ "'"); 5282 putcharacter (SCHEME_A_ '\'');
5092 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5283 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5093 putstr (SCHEME_A_ "`"); 5284 putcharacter (SCHEME_A_ '`');
5094 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5285 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5095 putstr (SCHEME_A_ ","); 5286 putcharacter (SCHEME_A_ ',');
5096 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5287 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5097 putstr (SCHEME_A_ ",@"); 5288 putstr (SCHEME_A_ ",@");
5098 else 5289 else
5099 { 5290 {
5100 putstr (SCHEME_A_ "("); 5291 putcharacter (SCHEME_A_ '(');
5101 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5292 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5102 SCHEME_V->args = a; 5293 SCHEME_V->args = a;
5103 } 5294 }
5104 5295
5105 s_goto (OP_P0LIST); 5296 s_goto (OP_P0LIST);
… …
5107 5298
5108 case OP_P1LIST: 5299 case OP_P1LIST:
5109 if (is_pair (args)) 5300 if (is_pair (args))
5110 { 5301 {
5111 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5302 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5112 putstr (SCHEME_A_ " "); 5303 putcharacter (SCHEME_A_ ' ');
5113 SCHEME_V->args = car (args); 5304 SCHEME_V->args = car (args);
5114 s_goto (OP_P0LIST); 5305 s_goto (OP_P0LIST);
5115 } 5306 }
5116 else if (is_vector (args)) 5307 else if (is_vector (args))
5117 { 5308 {
… …
5125 { 5316 {
5126 putstr (SCHEME_A_ " . "); 5317 putstr (SCHEME_A_ " . ");
5127 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5318 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5128 } 5319 }
5129 5320
5130 putstr (SCHEME_A_ ")"); 5321 putcharacter (SCHEME_A_ ')');
5131 s_return (S_T); 5322 s_return (S_T);
5132 } 5323 }
5133 5324
5134 case OP_PVECFROM: 5325 case OP_PVECFROM:
5135 { 5326 {
… …
5137 pointer vec = car (args); 5328 pointer vec = car (args);
5138 int len = veclength (vec); 5329 int len = veclength (vec);
5139 5330
5140 if (i == len) 5331 if (i == len)
5141 { 5332 {
5142 putstr (SCHEME_A_ ")"); 5333 putcharacter (SCHEME_A_ ')');
5143 s_return (S_T); 5334 s_return (S_T);
5144 } 5335 }
5145 else 5336 else
5146 { 5337 {
5147 pointer elem = vector_get (vec, i); 5338 pointer elem = vector_get (vec, i);
… …
5149 ivalue_unchecked (cdr (args)) = i + 1; 5340 ivalue_unchecked (cdr (args)) = i + 1;
5150 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5341 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5151 SCHEME_V->args = elem; 5342 SCHEME_V->args = elem;
5152 5343
5153 if (i > 0) 5344 if (i > 0)
5154 putstr (SCHEME_A_ " "); 5345 putcharacter (SCHEME_A_ ' ');
5155 5346
5156 s_goto (OP_P0LIST); 5347 s_goto (OP_P0LIST);
5157 } 5348 }
5158 } 5349 }
5159 } 5350 }
5160 5351
5161 if (USE_ERROR_CHECKING) abort (); 5352 if (USE_ERROR_CHECKING) abort ();
5162} 5353}
5163 5354
5164static int 5355/* list ops */
5356ecb_hot static int
5165opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5357opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5166{ 5358{
5167 pointer args = SCHEME_V->args; 5359 pointer args = SCHEME_V->args;
5168 pointer a = car (args); 5360 pointer a = car (args);
5169 pointer x, y; 5361 pointer x, y;
… …
5212 5404
5213 case OP_CLOSUREP: /* closure? */ 5405 case OP_CLOSUREP: /* closure? */
5214 /* 5406 /*
5215 * Note, macro object is also a closure. 5407 * Note, macro object is also a closure.
5216 * Therefore, (closure? <#MACRO>) ==> #t 5408 * Therefore, (closure? <#MACRO>) ==> #t
5409 * (schmorp) well, obviously not, fix? TODO
5217 */ 5410 */
5218 s_retbool (is_closure (a)); 5411 s_retbool (is_closure (a));
5219 5412
5220 case OP_MACROP: /* macro? */ 5413 case OP_MACROP: /* macro? */
5221 s_retbool (is_macro (a)); 5414 s_retbool (is_macro (a));
… …
5226 5419
5227/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5420/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5228typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5421typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5229 5422
5230typedef int (*test_predicate)(pointer); 5423typedef int (*test_predicate)(pointer);
5231static int 5424
5425ecb_hot static int
5232tst_any (pointer p) 5426tst_any (pointer p)
5233{ 5427{
5234 return 1; 5428 return 1;
5235} 5429}
5236 5430
5237static int 5431ecb_hot static int
5238tst_inonneg (pointer p) 5432tst_inonneg (pointer p)
5239{ 5433{
5240 return is_integer (p) && ivalue_unchecked (p) >= 0; 5434 return is_integer (p) && ivalue_unchecked (p) >= 0;
5241} 5435}
5242 5436
5243static int 5437ecb_hot static int
5244tst_is_list (SCHEME_P_ pointer p) 5438tst_is_list (SCHEME_P_ pointer p)
5245{ 5439{
5246 return p == NIL || is_pair (p); 5440 return p == NIL || is_pair (p);
5247} 5441}
5248 5442
… …
5291#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5485#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5292#include "opdefines.h" 5486#include "opdefines.h"
5293#undef OP_DEF 5487#undef OP_DEF
5294; 5488;
5295 5489
5296static const char * 5490ecb_cold static const char *
5297opname (int idx) 5491opname (int idx)
5298{ 5492{
5299 const char *name = opnames; 5493 const char *name = opnames;
5300 5494
5301 /* should do this at compile time, but would require external program, right? */ 5495 /* should do this at compile time, but would require external program, right? */
… …
5303 name += strlen (name) + 1; 5497 name += strlen (name) + 1;
5304 5498
5305 return *name ? name : "ILLEGAL"; 5499 return *name ? name : "ILLEGAL";
5306} 5500}
5307 5501
5308static const char * 5502ecb_cold static const char *
5309procname (pointer x) 5503procname (pointer x)
5310{ 5504{
5311 return opname (procnum (x)); 5505 return opname (procnum (x));
5312} 5506}
5313 5507
… …
5333#undef OP_DEF 5527#undef OP_DEF
5334 {0} 5528 {0}
5335}; 5529};
5336 5530
5337/* kernel of this interpreter */ 5531/* kernel of this interpreter */
5338static void ecb_hot 5532ecb_hot static void
5339Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5533Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5340{ 5534{
5341 SCHEME_V->op = op; 5535 SCHEME_V->op = op;
5342 5536
5343 for (;;) 5537 for (;;)
… …
5426 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5620 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5427 return; 5621 return;
5428 5622
5429 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5623 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5430 { 5624 {
5431 xwrstr ("No memory!\n"); 5625 putstr (SCHEME_A_ "No memory!\n");
5432 return; 5626 return;
5433 } 5627 }
5434 } 5628 }
5435} 5629}
5436 5630
5437/* ========== Initialization of internal keywords ========== */ 5631/* ========== Initialization of internal keywords ========== */
5438 5632
5439static void 5633ecb_cold static void
5440assign_syntax (SCHEME_P_ const char *name) 5634assign_syntax (SCHEME_P_ const char *name)
5441{ 5635{
5442 pointer x = oblist_add_by_name (SCHEME_A_ name); 5636 pointer x = oblist_add_by_name (SCHEME_A_ name);
5443 set_typeflag (x, typeflag (x) | T_SYNTAX); 5637 set_typeflag (x, typeflag (x) | T_SYNTAX);
5444} 5638}
5445 5639
5446static void 5640ecb_cold static void
5447assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5641assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5448{ 5642{
5449 pointer x = mk_symbol (SCHEME_A_ name); 5643 pointer x = mk_symbol (SCHEME_A_ name);
5450 pointer y = mk_proc (SCHEME_A_ op); 5644 pointer y = mk_proc (SCHEME_A_ op);
5451 new_slot_in_env (SCHEME_A_ x, y); 5645 new_slot_in_env (SCHEME_A_ x, y);
… …
5459 ivalue_unchecked (y) = op; 5653 ivalue_unchecked (y) = op;
5460 return y; 5654 return y;
5461} 5655}
5462 5656
5463/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5657/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5464static int 5658ecb_hot static int
5465syntaxnum (pointer p) 5659syntaxnum (pointer p)
5466{ 5660{
5467 const char *s = strvalue (car (p)); 5661 const char *s = strvalue (p);
5468 5662
5469 switch (strlength (car (p))) 5663 switch (strlength (p))
5470 { 5664 {
5471 case 2: 5665 case 2:
5472 if (s[0] == 'i') 5666 if (s[0] == 'i')
5473 return OP_IF0; /* if */ 5667 return OP_IF0; /* if */
5474 else 5668 else
… …
5549ecb_cold int 5743ecb_cold int
5550scheme_init (SCHEME_P) 5744scheme_init (SCHEME_P)
5551{ 5745{
5552 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5746 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5553 pointer x; 5747 pointer x;
5748
5749 /* this memset is not strictly correct, as we assume (intcache)
5750 * that memset 0 will also set pointers to 0, but memset does
5751 * of course not guarantee that. screw such systems.
5752 */
5753 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5554 5754
5555 num_set_fixnum (num_zero, 1); 5755 num_set_fixnum (num_zero, 1);
5556 num_set_ivalue (num_zero, 0); 5756 num_set_ivalue (num_zero, 0);
5557 num_set_fixnum (num_one, 1); 5757 num_set_fixnum (num_one, 1);
5558 num_set_ivalue (num_one, 1); 5758 num_set_ivalue (num_one, 1);
… …
5570 SCHEME_V->save_inport = NIL; 5770 SCHEME_V->save_inport = NIL;
5571 SCHEME_V->loadport = NIL; 5771 SCHEME_V->loadport = NIL;
5572 SCHEME_V->nesting = 0; 5772 SCHEME_V->nesting = 0;
5573 SCHEME_V->interactive_repl = 0; 5773 SCHEME_V->interactive_repl = 0;
5574 5774
5575 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5775 if (!alloc_cellseg (SCHEME_A))
5576 { 5776 {
5577#if USE_ERROR_CHECKING 5777#if USE_ERROR_CHECKING
5578 SCHEME_V->no_memory = 1; 5778 SCHEME_V->no_memory = 1;
5579 return 0; 5779 return 0;
5580#endif 5780#endif
5581 } 5781 }
5582 5782
5583 SCHEME_V->gc_verbose = 0; 5783 SCHEME_V->gc_verbose = 0;
5584 dump_stack_initialize (SCHEME_A); 5784 dump_stack_initialize (SCHEME_A);
5585 SCHEME_V->code = NIL; 5785 SCHEME_V->code = NIL;
5586 SCHEME_V->args = NIL; 5786 SCHEME_V->args = NIL;
5587 SCHEME_V->envir = NIL; 5787 SCHEME_V->envir = NIL;
5788 SCHEME_V->value = NIL;
5588 SCHEME_V->tracing = 0; 5789 SCHEME_V->tracing = 0;
5589 5790
5590 /* init NIL */ 5791 /* init NIL */
5591 set_typeflag (NIL, T_ATOM | T_MARK); 5792 set_typeflag (NIL, T_ATOM | T_MARK);
5592 set_car (NIL, NIL); 5793 set_car (NIL, NIL);
… …
5648 5849
5649 return !SCHEME_V->no_memory; 5850 return !SCHEME_V->no_memory;
5650} 5851}
5651 5852
5652#if USE_PORTS 5853#if USE_PORTS
5653void 5854ecb_cold void
5654scheme_set_input_port_file (SCHEME_P_ int fin) 5855scheme_set_input_port_file (SCHEME_P_ int fin)
5655{ 5856{
5656 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 5857 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5657} 5858}
5658 5859
5659void 5860ecb_cold void
5660scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 5861scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5661{ 5862{
5662 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 5863 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5663} 5864}
5664 5865
5665void 5866ecb_cold void
5666scheme_set_output_port_file (SCHEME_P_ int fout) 5867scheme_set_output_port_file (SCHEME_P_ int fout)
5667{ 5868{
5668 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 5869 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5669} 5870}
5670 5871
5671void 5872ecb_cold void
5672scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 5873scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5673{ 5874{
5674 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 5875 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5675} 5876}
5676#endif 5877#endif
5677 5878
5678void 5879ecb_cold void
5679scheme_set_external_data (SCHEME_P_ void *p) 5880scheme_set_external_data (SCHEME_P_ void *p)
5680{ 5881{
5681 SCHEME_V->ext_data = p; 5882 SCHEME_V->ext_data = p;
5682} 5883}
5683 5884
… …
5715 SCHEME_V->loadport = NIL; 5916 SCHEME_V->loadport = NIL;
5716 SCHEME_V->gc_verbose = 0; 5917 SCHEME_V->gc_verbose = 0;
5717 gc (SCHEME_A_ NIL, NIL); 5918 gc (SCHEME_A_ NIL, NIL);
5718 5919
5719 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 5920 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5720 free (SCHEME_V->alloc_seg[i]); 5921 free (SCHEME_V->cell_seg[i]);
5721 5922
5722#if SHOW_ERROR_LINE 5923#if SHOW_ERROR_LINE
5723 for (i = 0; i <= SCHEME_V->file_i; i++) 5924 for (i = 0; i <= SCHEME_V->file_i; i++)
5724 { 5925 {
5725 if (SCHEME_V->load_stack[i].kind & port_file) 5926 if (SCHEME_V->load_stack[i].kind & port_file)
… …
5731 } 5932 }
5732 } 5933 }
5733#endif 5934#endif
5734} 5935}
5735 5936
5736void 5937ecb_cold void
5737scheme_load_file (SCHEME_P_ int fin) 5938scheme_load_file (SCHEME_P_ int fin)
5738{ 5939{
5739 scheme_load_named_file (SCHEME_A_ fin, 0); 5940 scheme_load_named_file (SCHEME_A_ fin, 0);
5740} 5941}
5741 5942
5742void 5943ecb_cold void
5743scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 5944scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5744{ 5945{
5745 dump_stack_reset (SCHEME_A); 5946 dump_stack_reset (SCHEME_A);
5746 SCHEME_V->envir = SCHEME_V->global_env; 5947 SCHEME_V->envir = SCHEME_V->global_env;
5747 SCHEME_V->file_i = 0; 5948 SCHEME_V->file_i = 0;
5748 SCHEME_V->load_stack[0].unget = -1; 5949 SCHEME_V->load_stack[0].unget = -1;
5749 SCHEME_V->load_stack[0].kind = port_input | port_file; 5950 SCHEME_V->load_stack[0].kind = port_input | port_file;
5750 SCHEME_V->load_stack[0].rep.stdio.file = fin; 5951 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5751#if USE_PORTS
5752 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5952 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5753#endif
5754 SCHEME_V->retcode = 0; 5953 SCHEME_V->retcode = 0;
5755 5954
5756#if USE_PORTS
5757 if (fin == STDIN_FILENO) 5955 if (fin == STDIN_FILENO)
5758 SCHEME_V->interactive_repl = 1; 5956 SCHEME_V->interactive_repl = 1;
5759#endif
5760 5957
5761#if USE_PORTS 5958#if USE_PORTS
5762#if SHOW_ERROR_LINE 5959#if SHOW_ERROR_LINE
5763 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 5960 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5764 5961
… …
5768#endif 5965#endif
5769 5966
5770 SCHEME_V->inport = SCHEME_V->loadport; 5967 SCHEME_V->inport = SCHEME_V->loadport;
5771 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 5968 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5772 Eval_Cycle (SCHEME_A_ OP_T0LVL); 5969 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5970
5773 set_typeflag (SCHEME_V->loadport, T_ATOM); 5971 set_typeflag (SCHEME_V->loadport, T_ATOM);
5774 5972
5775 if (SCHEME_V->retcode == 0) 5973 if (SCHEME_V->retcode == 0)
5776 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5974 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5777} 5975}
5778 5976
5779void 5977ecb_cold void
5780scheme_load_string (SCHEME_P_ const char *cmd) 5978scheme_load_string (SCHEME_P_ const char *cmd)
5781{ 5979{
5980#if USE_PORTs
5782 dump_stack_reset (SCHEME_A); 5981 dump_stack_reset (SCHEME_A);
5783 SCHEME_V->envir = SCHEME_V->global_env; 5982 SCHEME_V->envir = SCHEME_V->global_env;
5784 SCHEME_V->file_i = 0; 5983 SCHEME_V->file_i = 0;
5785 SCHEME_V->load_stack[0].kind = port_input | port_string; 5984 SCHEME_V->load_stack[0].kind = port_input | port_string;
5786 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */ 5985 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5787 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd); 5986 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5788 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 5987 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5789#if USE_PORTS
5790 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 5988 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5791#endif
5792 SCHEME_V->retcode = 0; 5989 SCHEME_V->retcode = 0;
5793 SCHEME_V->interactive_repl = 0; 5990 SCHEME_V->interactive_repl = 0;
5794 SCHEME_V->inport = SCHEME_V->loadport; 5991 SCHEME_V->inport = SCHEME_V->loadport;
5795 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 5992 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5796 Eval_Cycle (SCHEME_A_ OP_T0LVL); 5993 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5797 set_typeflag (SCHEME_V->loadport, T_ATOM); 5994 set_typeflag (SCHEME_V->loadport, T_ATOM);
5798 5995
5799 if (SCHEME_V->retcode == 0) 5996 if (SCHEME_V->retcode == 0)
5800 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5997 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5998#else
5999 abort ();
6000#endif
5801} 6001}
5802 6002
5803void 6003ecb_cold void
5804scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6004scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5805{ 6005{
5806 pointer x; 6006 pointer x;
5807 6007
5808 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6008 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5813 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6013 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5814} 6014}
5815 6015
5816#if !STANDALONE 6016#if !STANDALONE
5817 6017
5818void 6018ecb_cold void
5819scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6019scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5820{ 6020{
5821 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6021 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5822} 6022}
5823 6023
5824void 6024ecb_cold void
5825scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6025scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5826{ 6026{
5827 int i; 6027 int i;
5828 6028
5829 for (i = 0; i < count; i++) 6029 for (i = 0; i < count; i++)
5830 scheme_register_foreign_func (SCHEME_A_ list + i); 6030 scheme_register_foreign_func (SCHEME_A_ list + i);
5831} 6031}
5832 6032
5833pointer 6033ecb_cold pointer
5834scheme_apply0 (SCHEME_P_ const char *procname) 6034scheme_apply0 (SCHEME_P_ const char *procname)
5835{ 6035{
5836 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6036 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5837} 6037}
5838 6038
5839void 6039ecb_cold void
5840save_from_C_call (SCHEME_P) 6040save_from_C_call (SCHEME_P)
5841{ 6041{
5842 pointer saved_data = cons (car (S_SINK), 6042 pointer saved_data = cons (car (S_SINK),
5843 cons (SCHEME_V->envir, 6043 cons (SCHEME_V->envir,
5844 SCHEME_V->dump)); 6044 SCHEME_V->dump));
… …
5848 /* Truncate the dump stack so TS will return here when done, not 6048 /* Truncate the dump stack so TS will return here when done, not
5849 directly resume pre-C-call operations. */ 6049 directly resume pre-C-call operations. */
5850 dump_stack_reset (SCHEME_A); 6050 dump_stack_reset (SCHEME_A);
5851} 6051}
5852 6052
5853void 6053ecb_cold void
5854restore_from_C_call (SCHEME_P) 6054restore_from_C_call (SCHEME_P)
5855{ 6055{
5856 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6056 set_car (S_SINK, caar (SCHEME_V->c_nest));
5857 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6057 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5858 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6058 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5859 /* Pop */ 6059 /* Pop */
5860 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6060 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5861} 6061}
5862 6062
5863/* "func" and "args" are assumed to be already eval'ed. */ 6063/* "func" and "args" are assumed to be already eval'ed. */
5864pointer 6064ecb_cold pointer
5865scheme_call (SCHEME_P_ pointer func, pointer args) 6065scheme_call (SCHEME_P_ pointer func, pointer args)
5866{ 6066{
5867 int old_repl = SCHEME_V->interactive_repl; 6067 int old_repl = SCHEME_V->interactive_repl;
5868 6068
5869 SCHEME_V->interactive_repl = 0; 6069 SCHEME_V->interactive_repl = 0;
… …
5876 SCHEME_V->interactive_repl = old_repl; 6076 SCHEME_V->interactive_repl = old_repl;
5877 restore_from_C_call (SCHEME_A); 6077 restore_from_C_call (SCHEME_A);
5878 return SCHEME_V->value; 6078 return SCHEME_V->value;
5879} 6079}
5880 6080
5881pointer 6081ecb_cold pointer
5882scheme_eval (SCHEME_P_ pointer obj) 6082scheme_eval (SCHEME_P_ pointer obj)
5883{ 6083{
5884 int old_repl = SCHEME_V->interactive_repl; 6084 int old_repl = SCHEME_V->interactive_repl;
5885 6085
5886 SCHEME_V->interactive_repl = 0; 6086 SCHEME_V->interactive_repl = 0;
… …
5898 6098
5899/* ========== Main ========== */ 6099/* ========== Main ========== */
5900 6100
5901#if STANDALONE 6101#if STANDALONE
5902 6102
5903int 6103ecb_cold int
5904main (int argc, char **argv) 6104main (int argc, char **argv)
5905{ 6105{
5906# if USE_MULTIPLICITY 6106# if USE_MULTIPLICITY
5907 scheme ssc; 6107 scheme ssc;
5908 scheme *const SCHEME_V = &ssc; 6108 scheme *const SCHEME_V = &ssc;
… …
5910# endif 6110# endif
5911 int fin; 6111 int fin;
5912 char *file_name = InitFile; 6112 char *file_name = InitFile;
5913 int retcode; 6113 int retcode;
5914 int isfile = 1; 6114 int isfile = 1;
6115 system ("ps v $PPID");//D
5915 6116
5916 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6117 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5917 { 6118 {
5918 xwrstr ("Usage: tinyscheme -?\n"); 6119 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5919 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6120 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5920 xwrstr ("followed by\n"); 6121 putstr (SCHEME_A_ "followed by\n");
5921 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6122 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5922 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6123 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5923 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6124 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5924 xwrstr ("Use - as filename for stdin.\n"); 6125 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5925 return 1; 6126 return 1;
5926 } 6127 }
5927 6128
5928 if (!scheme_init (SCHEME_A)) 6129 if (!scheme_init (SCHEME_A))
5929 { 6130 {
5930 xwrstr ("Could not initialize!\n"); 6131 putstr (SCHEME_A_ "Could not initialize!\n");
5931 return 2; 6132 return 2;
5932 } 6133 }
5933 6134
5934# if USE_PORTS 6135# if USE_PORTS
5935 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6136 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
5948 } 6149 }
5949#endif 6150#endif
5950 6151
5951 do 6152 do
5952 { 6153 {
5953#if USE_PORTS
5954 if (strcmp (file_name, "-") == 0) 6154 if (strcmp (file_name, "-") == 0)
5955 fin = STDIN_FILENO; 6155 fin = STDIN_FILENO;
5956 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6156 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
5957 { 6157 {
5958 pointer args = NIL; 6158 pointer args = NIL;
… …
5976 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6176 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
5977 6177
5978 } 6178 }
5979 else 6179 else
5980 fin = open (file_name, O_RDONLY); 6180 fin = open (file_name, O_RDONLY);
5981#endif
5982 6181
5983 if (isfile && fin < 0) 6182 if (isfile && fin < 0)
5984 { 6183 {
5985 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6184 putstr (SCHEME_A_ "Could not open file ");
6185 putstr (SCHEME_A_ file_name);
6186 putcharacter (SCHEME_A_ '\n');
5986 } 6187 }
5987 else 6188 else
5988 { 6189 {
5989 if (isfile) 6190 if (isfile)
5990 scheme_load_named_file (SCHEME_A_ fin, file_name); 6191 scheme_load_named_file (SCHEME_A_ fin, file_name);
5991 else 6192 else
5992 scheme_load_string (SCHEME_A_ file_name); 6193 scheme_load_string (SCHEME_A_ file_name);
5993 6194
5994#if USE_PORTS
5995 if (!isfile || fin != STDIN_FILENO) 6195 if (!isfile || fin != STDIN_FILENO)
5996 { 6196 {
5997 if (SCHEME_V->retcode != 0) 6197 if (SCHEME_V->retcode != 0)
5998 { 6198 {
5999 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6199 putstr (SCHEME_A_ "Errors encountered reading ");
6200 putstr (SCHEME_A_ file_name);
6201 putcharacter (SCHEME_A_ '\n');
6000 } 6202 }
6001 6203
6002 if (isfile) 6204 if (isfile)
6003 close (fin); 6205 close (fin);
6004 } 6206 }
6005#endif
6006 } 6207 }
6007 6208
6008 file_name = *argv++; 6209 file_name = *argv++;
6009 } 6210 }
6010 while (file_name != 0); 6211 while (file_name != 0);

Diff Legend

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