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.40 by root, Mon Nov 30 05:19:01 2015 UTC vs.
Revision 1.65 by root, Wed Dec 2 17:01:51 2015 UTC

… …
16 * (MINISCM) This is a revised and modified version by Akira KIDA. 16 * (MINISCM) This is a revised and modified version by Akira KIDA.
17 * (MINISCM) current version is 0.85k4 (15 May 1994) 17 * (MINISCM) current version is 0.85k4 (15 May 1994)
18 * 18 *
19 */ 19 */
20 20
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 21#define _POSIX_C_SOURCE 200201
22#include "malloc.c" 22#define _XOPEN_SOURCE 600
23#define _GNU_SOURCE 1 /* for malloc mremap */
23 24
24#define SCHEME_SOURCE 25#define SCHEME_SOURCE
25#include "scheme-private.h" 26#include "scheme-private.h"
26#ifndef WIN32 27#ifndef WIN32
27# include <unistd.h> 28# include <unistd.h>
28#endif 29#endif
29#if USE_MATH 30#if USE_MATH
30# include <math.h> 31# include <math.h>
31#endif 32#endif
32 33
34#define ECB_NO_THREADS 1
33#include "ecb.h" 35#include "ecb.h"
34 36
35#include <sys/types.h> 37#include <sys/types.h>
36#include <sys/stat.h> 38#include <sys/stat.h>
37#include <fcntl.h> 39#include <fcntl.h>
… …
45#include <string.h> 47#include <string.h>
46 48
47#include <limits.h> 49#include <limits.h>
48#include <inttypes.h> 50#include <inttypes.h>
49#include <float.h> 51#include <float.h>
50//#include <ctype.h> 52
53#if !USE_SYSTEM_MALLOC
54# define PAGE_SIZE 4096 /* does not work on sparc/alpha */
55# include "malloc.c"
56# define malloc(n) tiny_malloc (n)
57# define realloc(p,n) tiny_realloc (p, n)
58# define free(p) tiny_free (p)
59#endif
51 60
52#if '1' != '0' + 1 \ 61#if '1' != '0' + 1 \
53 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \ 62 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
54 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \ 63 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
55 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \ 64 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
… …
77 86
78#define BACKQUOTE '`' 87#define BACKQUOTE '`'
79#define WHITESPACE " \t\r\n\v\f" 88#define WHITESPACE " \t\r\n\v\f"
80#define DELIMITERS "()\";" WHITESPACE 89#define DELIMITERS "()\";" WHITESPACE
81 90
82#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 91#define NIL POINTER (&SCHEME_V->xNIL)
83#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 92#define S_T POINTER (&SCHEME_V->xT)
84#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 93#define S_F POINTER (&SCHEME_V->xF)
85#define S_SINK (&SCHEME_V->xsink) 94#define S_SINK POINTER (&SCHEME_V->xsink)
86#define S_EOF (&SCHEME_V->xEOF_OBJ) 95#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
87 96
88#if !USE_MULTIPLICITY 97#if !USE_MULTIPLICITY
89static scheme sc; 98static scheme sc;
90#endif 99#endif
91 100
92static void 101ecb_cold static void
93xbase (char *s, long n, int base) 102xbase (char *s, long n, int base)
94{ 103{
95 if (n < 0) 104 if (n < 0)
96 { 105 {
97 *s++ = '-'; 106 *s++ = '-';
… …
99 } 108 }
100 109
101 char *p = s; 110 char *p = s;
102 111
103 do { 112 do {
104 *p++ = '0' + n % base; 113 *p++ = "0123456789abcdef"[n % base];
105 n /= base; 114 n /= base;
106 } while (n); 115 } while (n);
107 116
108 *p-- = 0; 117 *p-- = 0;
109 118
… …
112 char x = *s; *s = *p; *p = x; 121 char x = *s; *s = *p; *p = x;
113 --p; ++s; 122 --p; ++s;
114 } 123 }
115} 124}
116 125
117static void 126ecb_cold static void
118xnum (char *s, long n) 127xnum (char *s, long n)
119{ 128{
120 xbase (s, n, 10); 129 xbase (s, n, 10);
121} 130}
122 131
123static void 132ecb_cold static void
124xwrstr (const char *s) 133putnum (SCHEME_P_ long n)
125{
126 write (1, s, strlen (s));
127}
128
129static void
130xwrnum (long n)
131{ 134{
132 char buf[64]; 135 char buf[64];
133 136
134 xnum (buf, n); 137 xnum (buf, n);
135 xwrstr (buf); 138 putstr (SCHEME_A_ buf);
136} 139}
140
141#if USE_CHAR_CLASSIFIERS
142#include <ctype.h>
143#else
137 144
138static char 145static char
139xtoupper (char c) 146xtoupper (char c)
140{ 147{
141 if (c >= 'a' && c <= 'z') 148 if (c >= 'a' && c <= 'z')
… …
161 168
162#define toupper(c) xtoupper (c) 169#define toupper(c) xtoupper (c)
163#define tolower(c) xtolower (c) 170#define tolower(c) xtolower (c)
164#define isdigit(c) xisdigit (c) 171#define isdigit(c) xisdigit (c)
165 172
173#endif
174
166#if USE_IGNORECASE 175#if USE_IGNORECASE
167static const char * 176ecb_cold static const char *
168xstrlwr (char *s) 177xstrlwr (char *s)
169{ 178{
170 const char *p = s; 179 const char *p = s;
171 180
172 while (*s) 181 while (*s)
… …
185# define stricmp(a,b) strcmp (a, b) 194# define stricmp(a,b) strcmp (a, b)
186# define strlwr(s) (s) 195# define strlwr(s) (s)
187#endif 196#endif
188 197
189#ifndef prompt 198#ifndef prompt
190# define prompt "ts> " 199# define prompt "ms> "
191#endif 200#endif
192 201
193#ifndef InitFile 202#ifndef InitFile
194# define InitFile "init.scm" 203# define InitFile "init.scm"
195#endif 204#endif
196 205
197#ifndef FIRST_CELLSEGS
198# define FIRST_CELLSEGS 3
199#endif
200
201enum scheme_types 206enum scheme_types
202{ 207{
203 T_INTEGER, 208 T_INTEGER,
209 T_CHARACTER,
204 T_REAL, 210 T_REAL,
205 T_STRING, 211 T_STRING,
206 T_SYMBOL, 212 T_SYMBOL,
207 T_PROC, 213 T_PROC,
208 T_PAIR, /* also used for free cells */ 214 T_PAIR, /* also used for free cells */
209 T_CLOSURE, 215 T_CLOSURE,
216 T_BYTECODE, // temp
217 T_MACRO,
210 T_CONTINUATION, 218 T_CONTINUATION,
211 T_FOREIGN, 219 T_FOREIGN,
212 T_CHARACTER,
213 T_PORT, 220 T_PORT,
214 T_VECTOR, 221 T_VECTOR,
215 T_MACRO,
216 T_PROMISE, 222 T_PROMISE,
217 T_ENVIRONMENT, 223 T_ENVIRONMENT,
218 /* one more... */ 224
219 T_NUM_SYSTEM_TYPES 225 T_NUM_SYSTEM_TYPES
220}; 226};
221 227
222#define T_MASKTYPE 0x000f 228#define T_MASKTYPE 0x000f
223#define T_SYNTAX 0x0010 229#define T_SYNTAX 0x0010
… …
256static num num_op (enum num_op op, num a, num b); 262static num num_op (enum num_op op, num a, num b);
257static num num_intdiv (num a, num b); 263static num num_intdiv (num a, num b);
258static num num_rem (num a, num b); 264static num num_rem (num a, num b);
259static num num_mod (num a, num b); 265static num num_mod (num a, num b);
260 266
261#if USE_MATH
262static double round_per_R5RS (double x);
263#endif
264static int is_zero_rvalue (RVALUE x); 267static int is_zero_rvalue (RVALUE x);
265 268
266static num num_zero; 269static num num_zero;
267static num num_one; 270static num num_one;
268 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
269/* macros for cell operations */ 276/* macros for cell operations */
270#define typeflag(p) ((p)->flag + 0) 277#define typeflag(p) (CELL(p)->flag + 0)
271#define set_typeflag(p,v) ((p)->flag = (v)) 278#define set_typeflag(p,v) (CELL(p)->flag = (v))
272#define type(p) (typeflag (p) & T_MASKTYPE) 279#define type(p) (typeflag (p) & T_MASKTYPE)
273 280
274INTERFACE int 281INTERFACE int
275is_string (pointer p) 282is_string (pointer p)
276{ 283{
277 return type (p) == T_STRING; 284 return type (p) == T_STRING;
278} 285}
279 286
280#define strvalue(p) ((p)->object.string.svalue) 287#define strvalue(p) (CELL(p)->object.string.svalue)
281#define strlength(p) ((p)->object.string.length) 288#define strlength(p) (CELL(p)->object.string.length)
282 289
283INTERFACE int 290INTERFACE int
284is_vector (pointer p) 291is_vector (pointer p)
285{ 292{
286 return type (p) == T_VECTOR; 293 return type (p) == T_VECTOR;
287} 294}
288 295
289#define vecvalue(p) ((p)->object.vector.vvalue) 296#define vecvalue(p) (CELL(p)->object.vector.vvalue)
290#define veclength(p) ((p)->object.vector.length) 297#define veclength(p) (CELL(p)->object.vector.length)
291INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj); 298INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
292INTERFACE pointer vector_get (pointer vec, uint32_t ielem); 299INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
293INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a); 300INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
294 301
295INTERFACE int 302INTERFACE int
… …
321string_value (pointer p) 328string_value (pointer p)
322{ 329{
323 return strvalue (p); 330 return strvalue (p);
324} 331}
325 332
326#define ivalue_unchecked(p) (p)->object.ivalue 333#define ivalue_unchecked(p) CELL(p)->object.ivalue
327#define set_ivalue(p,v) (p)->object.ivalue = (v) 334#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
328 335
329#if USE_REAL 336#if USE_REAL
330#define rvalue_unchecked(p) (p)->object.rvalue 337#define rvalue_unchecked(p) CELL(p)->object.rvalue
331#define set_rvalue(p,v) (p)->object.rvalue = (v) 338#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
332#else 339#else
333#define rvalue_unchecked(p) (p)->object.ivalue 340#define rvalue_unchecked(p) CELL(p)->object.ivalue
334#define set_rvalue(p,v) (p)->object.ivalue = (v) 341#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
335#endif 342#endif
336 343
337INTERFACE long 344INTERFACE long
338charvalue (pointer p) 345charvalue (pointer p)
339{ 346{
340 return ivalue_unchecked (p); 347 return ivalue_unchecked (p);
341} 348}
342 349
350#define port(p) CELL(p)->object.port
351#define set_port(p,v) port(p) = (v)
343INTERFACE int 352INTERFACE int
344is_port (pointer p) 353is_port (pointer p)
345{ 354{
346 return type (p) == T_PORT; 355 return type (p) == T_PORT;
347} 356}
348 357
349INTERFACE int 358INTERFACE int
350is_inport (pointer p) 359is_inport (pointer p)
351{ 360{
352 return is_port (p) && p->object.port->kind & port_input; 361 return is_port (p) && port (p)->kind & port_input;
353} 362}
354 363
355INTERFACE int 364INTERFACE int
356is_outport (pointer p) 365is_outport (pointer p)
357{ 366{
358 return is_port (p) && p->object.port->kind & port_output; 367 return is_port (p) && port (p)->kind & port_output;
359} 368}
360 369
361INTERFACE int 370INTERFACE int
362is_pair (pointer p) 371is_pair (pointer p)
363{ 372{
364 return type (p) == T_PAIR; 373 return type (p) == T_PAIR;
365} 374}
366 375
367#define car(p) ((p)->object.cons.car + 0) 376#define car(p) (POINTER (CELL(p)->object.cons.car))
368#define cdr(p) ((p)->object.cons.cdr + 0) 377#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
369 378
370static pointer caar (pointer p) { return car (car (p)); } 379static pointer caar (pointer p) { return car (car (p)); }
371static pointer cadr (pointer p) { return car (cdr (p)); } 380static pointer cadr (pointer p) { return car (cdr (p)); }
372static pointer cdar (pointer p) { return cdr (car (p)); } 381static pointer cdar (pointer p) { return cdr (car (p)); }
373static pointer cddr (pointer p) { return cdr (cdr (p)); } 382static pointer cddr (pointer p) { return cdr (cdr (p)); }
374 383
375static pointer cadar (pointer p) { return car (cdr (car (p))); } 384static pointer cadar (pointer p) { return car (cdr (car (p))); }
376static pointer caddr (pointer p) { return car (cdr (cdr (p))); } 385static pointer caddr (pointer p) { return car (cdr (cdr (p))); }
377static pointer cdaar (pointer p) { return cdr (car (car (p))); } 386static pointer cdaar (pointer p) { return cdr (car (car (p))); }
378 387
388static pointer cadddr (pointer p) { return car (car (car (cdr (p)))); }
389
379INTERFACE void 390INTERFACE void
380set_car (pointer p, pointer q) 391set_car (pointer p, pointer q)
381{ 392{
382 p->object.cons.car = q; 393 CELL(p)->object.cons.car = CELL (q);
383} 394}
384 395
385INTERFACE void 396INTERFACE void
386set_cdr (pointer p, pointer q) 397set_cdr (pointer p, pointer q)
387{ 398{
388 p->object.cons.cdr = q; 399 CELL(p)->object.cons.cdr = CELL (q);
389} 400}
390 401
391INTERFACE pointer 402INTERFACE pointer
392pair_car (pointer p) 403pair_car (pointer p)
393{ 404{
… …
411{ 422{
412 return strvalue (p); 423 return strvalue (p);
413} 424}
414 425
415#if USE_PLIST 426#if USE_PLIST
427#error plists are broken because symbols are no longer pairs
428#define symprop(p) cdr(p)
416SCHEME_EXPORT int 429SCHEME_EXPORT int
417hasprop (pointer p) 430hasprop (pointer p)
418{ 431{
419 return typeflag (p) & T_SYMBOL; 432 return typeflag (p) & T_SYMBOL;
420} 433}
421
422# define symprop(p) cdr(p)
423#endif 434#endif
424 435
425INTERFACE int 436INTERFACE int
426is_syntax (pointer p) 437is_syntax (pointer p)
427{ 438{
… …
523 proper list: length 534 proper list: length
524 circular list: -1 535 circular list: -1
525 not even a pair: -2 536 not even a pair: -2
526 dotted list: -2 minus length before dot 537 dotted list: -2 minus length before dot
527*/ 538*/
528INTERFACE int 539ecb_hot INTERFACE int
529list_length (SCHEME_P_ pointer a) 540list_length (SCHEME_P_ pointer a)
530{ 541{
531 int i = 0; 542 int i = 0;
532 pointer slow, fast; 543 pointer slow, fast;
533 544
… …
572{ 583{
573 return list_length (SCHEME_A_ a) >= 0; 584 return list_length (SCHEME_A_ a) >= 0;
574} 585}
575 586
576#if USE_CHAR_CLASSIFIERS 587#if USE_CHAR_CLASSIFIERS
588
577ecb_inline int 589ecb_inline int
578Cisalpha (int c) 590Cisalpha (int c)
579{ 591{
580 return isascii (c) && isalpha (c); 592 return isascii (c) && isalpha (c);
581} 593}
… …
639 "gs", 651 "gs",
640 "rs", 652 "rs",
641 "us" 653 "us"
642}; 654};
643 655
644static int 656ecb_cold static int
645is_ascii_name (const char *name, int *pc) 657is_ascii_name (const char *name, int *pc)
646{ 658{
647 int i; 659 int i;
648 660
649 for (i = 0; i < 32; i++) 661 for (i = 0; i < 32; i++)
… …
668 680
669static int file_push (SCHEME_P_ const char *fname); 681static int file_push (SCHEME_P_ const char *fname);
670static void file_pop (SCHEME_P); 682static void file_pop (SCHEME_P);
671static int file_interactive (SCHEME_P); 683static int file_interactive (SCHEME_P);
672ecb_inline int is_one_of (const char *s, int c); 684ecb_inline int is_one_of (const char *s, int c);
673static int alloc_cellseg (SCHEME_P_ int n); 685static int alloc_cellseg (SCHEME_P);
674ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 686ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
675static void finalize_cell (SCHEME_P_ pointer a); 687static void finalize_cell (SCHEME_P_ pointer a);
676static int count_consecutive_cells (pointer x, int needed);
677static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 688static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
678static pointer mk_number (SCHEME_P_ const num n); 689static pointer mk_number (SCHEME_P_ const num n);
679static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 690static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
680static pointer mk_vector (SCHEME_P_ uint32_t len); 691static pointer mk_vector (SCHEME_P_ uint32_t len);
681static pointer mk_atom (SCHEME_P_ char *q); 692static pointer mk_atom (SCHEME_P_ char *q);
682static pointer mk_sharp_const (SCHEME_P_ char *name); 693static pointer mk_sharp_const (SCHEME_P_ char *name);
683 694
695static pointer mk_port (SCHEME_P_ port *p);
696
684#if USE_PORTS 697#if USE_PORTS
685static pointer mk_port (SCHEME_P_ port *p);
686static pointer port_from_filename (SCHEME_P_ const char *fn, int prop); 698static pointer port_from_filename (SCHEME_P_ const char *fn, int prop);
687static pointer port_from_file (SCHEME_P_ int, int prop); 699static pointer port_from_file (SCHEME_P_ int, int prop);
688static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 700static pointer port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
689static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop); 701static port *port_rep_from_filename (SCHEME_P_ const char *fn, int prop);
690static port *port_rep_from_file (SCHEME_P_ int, int prop); 702static port *port_rep_from_file (SCHEME_P_ int, int prop);
691static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop); 703static port *port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop);
692static void port_close (SCHEME_P_ pointer p, int flag); 704static void port_close (SCHEME_P_ pointer p, int flag);
693#endif 705#endif
706
694static void mark (pointer a); 707static void mark (pointer a);
695static void gc (SCHEME_P_ pointer a, pointer b); 708static void gc (SCHEME_P_ pointer a, pointer b);
696static int basic_inchar (port *pt); 709static int basic_inchar (port *pt);
697static int inchar (SCHEME_P); 710static int inchar (SCHEME_P);
698static void backchar (SCHEME_P_ int c); 711static void backchar (SCHEME_P_ int c);
699static char *readstr_upto (SCHEME_P_ int skip, const char *delim); 712static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
700static pointer readstrexp (SCHEME_P_ char delim); 713static pointer readstrexp (SCHEME_P_ char delim);
701ecb_inline int skipspace (SCHEME_P); 714static int skipspace (SCHEME_P);
702static int token (SCHEME_P); 715static int token (SCHEME_P);
703static void printslashstring (SCHEME_P_ char *s, int len); 716static void printslashstring (SCHEME_P_ char *s, int len);
704static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 717static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
705static void printatom (SCHEME_P_ pointer l, int f); 718static void printatom (SCHEME_P_ pointer l, int f);
706static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 719static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
872 } 885 }
873 886
874 return ret; 887 return ret;
875} 888}
876 889
877#if USE_MATH
878
879/* Round to nearest. Round to even if midway */
880static double
881round_per_R5RS (double x)
882{
883 double fl = floor (x);
884 double ce = ceil (x);
885 double dfl = x - fl;
886 double dce = ce - x;
887
888 if (dfl > dce)
889 return ce;
890 else if (dfl < dce)
891 return fl;
892 else
893 {
894 if (fmod (fl, 2) == 0) /* I imagine this holds */
895 return fl;
896 else
897 return ce;
898 }
899}
900#endif
901
902static int 890static int
903is_zero_rvalue (RVALUE x) 891is_zero_rvalue (RVALUE x)
904{ 892{
905 return x == 0; 893 return x == 0;
906#if 0 894#if 0
… …
911#endif 899#endif
912#endif 900#endif
913} 901}
914 902
915/* allocate new cell segment */ 903/* allocate new cell segment */
916static int 904ecb_cold static int
917alloc_cellseg (SCHEME_P_ int n) 905alloc_cellseg (SCHEME_P)
918{ 906{
919 pointer newp; 907 struct cell *newp;
920 pointer last; 908 struct cell *last;
921 pointer p; 909 struct cell *p;
922 char *cp; 910 char *cp;
923 long i; 911 long i;
924 int k; 912 int k;
925 913
926 static int segsize = CELL_SEGSIZE >> 1; 914 static int segsize = CELL_SEGSIZE >> 1;
927 segsize <<= 1; 915 segsize <<= 1;
928 916
929 for (k = 0; k < n; k++)
930 {
931 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
932 return k;
933
934 cp = malloc (segsize * sizeof (struct cell)); 917 cp = malloc (segsize * sizeof (struct cell));
935 918
936 if (!cp && USE_ERROR_CHECKING) 919 if (!cp && USE_ERROR_CHECKING)
937 return k; 920 return k;
938 921
939 i = ++SCHEME_V->last_cell_seg; 922 i = ++SCHEME_V->last_cell_seg;
940 SCHEME_V->alloc_seg[i] = cp;
941 923
942 newp = (pointer)cp; 924 newp = (struct cell *)cp;
943 SCHEME_V->cell_seg[i] = newp; 925 SCHEME_V->cell_seg[i] = newp;
944 SCHEME_V->cell_segsize[i] = segsize; 926 SCHEME_V->cell_segsize[i] = segsize;
945 SCHEME_V->fcells += segsize; 927 SCHEME_V->fcells += segsize;
946 last = newp + segsize - 1; 928 last = newp + segsize - 1;
947 929
948 for (p = newp; p <= last; p++) 930 for (p = newp; p <= last; p++)
949 { 931 {
932 pointer cp = POINTER (p);
950 set_typeflag (p, T_PAIR); 933 set_typeflag (cp, T_PAIR);
951 set_car (p, NIL); 934 set_car (cp, NIL);
952 set_cdr (p, p + 1); 935 set_cdr (cp, POINTER (p + 1));
953 } 936 }
954 937
955 set_cdr (last, SCHEME_V->free_cell); 938 set_cdr (POINTER (last), SCHEME_V->free_cell);
956 SCHEME_V->free_cell = newp; 939 SCHEME_V->free_cell = POINTER (newp);
957 }
958 940
959 return n; 941 return 1;
960} 942}
961 943
962/* get new cell. parameter a, b is marked by gc. */ 944/* get new cell. parameter a, b is marked by gc. */
963ecb_inline pointer 945ecb_inline pointer
964get_cell_x (SCHEME_P_ pointer a, pointer b) 946get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
968 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 950 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
969 return S_SINK; 951 return S_SINK;
970 952
971 if (SCHEME_V->free_cell == NIL) 953 if (SCHEME_V->free_cell == NIL)
972 { 954 {
973 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 955 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 2;
974 956
975 gc (SCHEME_A_ a, b); 957 gc (SCHEME_A_ a, b);
976 958
977 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 959 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
978 { 960 {
979 /* if only a few recovered, get more to avoid fruitless gc's */ 961 /* if only a few recovered, get more to avoid fruitless gc's */
980 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 962 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
981 { 963 {
982#if USE_ERROR_CHECKING 964#if USE_ERROR_CHECKING
983 SCHEME_V->no_memory = 1; 965 SCHEME_V->no_memory = 1;
984 return S_SINK; 966 return S_SINK;
985#endif 967#endif
… …
997 } 979 }
998} 980}
999 981
1000/* To retain recent allocs before interpreter knows about them - 982/* To retain recent allocs before interpreter knows about them -
1001 Tehom */ 983 Tehom */
1002 984ecb_hot static void
1003static void
1004push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 985push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1005{ 986{
1006 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 987 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1007 988
1008 set_typeflag (holder, T_PAIR); 989 set_typeflag (holder, T_PAIR);
… …
1010 set_car (holder, recent); 991 set_car (holder, recent);
1011 set_cdr (holder, car (S_SINK)); 992 set_cdr (holder, car (S_SINK));
1012 set_car (S_SINK, holder); 993 set_car (S_SINK, holder);
1013} 994}
1014 995
1015static pointer 996ecb_hot static pointer
1016get_cell (SCHEME_P_ pointer a, pointer b) 997get_cell (SCHEME_P_ pointer a, pointer b)
1017{ 998{
1018 pointer cell = get_cell_x (SCHEME_A_ a, b); 999 pointer cell = get_cell_x (SCHEME_A_ a, b);
1019 1000
1020 /* For right now, include "a" and "b" in "cell" so that gc doesn't 1001 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
1029} 1010}
1030 1011
1031static pointer 1012static pointer
1032get_vector_object (SCHEME_P_ uint32_t len, pointer init) 1013get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1033{ 1014{
1034 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1015 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1035 pointer *e = malloc (len * sizeof (pointer)); 1016 pointer *e = malloc (len * sizeof (pointer));
1036 1017
1037 if (!e && USE_ERROR_CHECKING) 1018 if (!e && USE_ERROR_CHECKING)
1038 return S_SINK; 1019 return S_SINK;
1039 1020
1040 /* Record it as a vector so that gc understands it. */ 1021 /* Record it as a vector so that gc understands it. */
1041 set_typeflag (v, T_VECTOR | T_ATOM); 1022 set_typeflag (v, T_VECTOR | T_ATOM);
1042 1023
1043 v->object.vector.vvalue = e; 1024 CELL(v)->object.vector.vvalue = e;
1044 v->object.vector.length = len; 1025 CELL(v)->object.vector.length = len;
1045 fill_vector (v, 0, init); 1026 fill_vector (v, 0, init);
1046 push_recent_alloc (SCHEME_A_ v, NIL); 1027 push_recent_alloc (SCHEME_A_ v, NIL);
1047 1028
1048 return v; 1029 return v;
1049} 1030}
… …
1058static void 1039static void
1059check_cell_alloced (pointer p, int expect_alloced) 1040check_cell_alloced (pointer p, int expect_alloced)
1060{ 1041{
1061 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1042 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1062 if (typeflag (p) & !expect_alloced) 1043 if (typeflag (p) & !expect_alloced)
1063 xwrstr ("Cell is already allocated!\n"); 1044 putstr (SCHEME_A_ "Cell is already allocated!\n");
1064 1045
1065 if (!(typeflag (p)) & expect_alloced) 1046 if (!(typeflag (p)) & expect_alloced)
1066 xwrstr ("Cell is not allocated!\n"); 1047 putstr (SCHEME_A_ "Cell is not allocated!\n");
1067} 1048}
1068 1049
1069static void 1050static void
1070check_range_alloced (pointer p, int n, int expect_alloced) 1051check_range_alloced (pointer p, int n, int expect_alloced)
1071{ 1052{
… …
1077#endif 1058#endif
1078 1059
1079/* Medium level cell allocation */ 1060/* Medium level cell allocation */
1080 1061
1081/* get new cons cell */ 1062/* get new cons cell */
1082pointer 1063ecb_hot static pointer
1083xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1064xcons (SCHEME_P_ pointer a, pointer b)
1084{ 1065{
1085 pointer x = get_cell (SCHEME_A_ a, b); 1066 pointer x = get_cell (SCHEME_A_ a, b);
1086 1067
1087 set_typeflag (x, T_PAIR); 1068 set_typeflag (x, T_PAIR);
1088
1089 if (immutable)
1090 setimmutable (x);
1091 1069
1092 set_car (x, a); 1070 set_car (x, a);
1093 set_cdr (x, b); 1071 set_cdr (x, b);
1094 1072
1095 return x; 1073 return x;
1096} 1074}
1097 1075
1098/* ========== oblist implementation ========== */
1099
1100static pointer 1076ecb_hot static pointer
1077ximmutable_cons (SCHEME_P_ pointer a, pointer b)
1078{
1079 pointer x = xcons (SCHEME_A_ a, b);
1080 setimmutable (x);
1081 return x;
1082}
1083
1084#define cons(a,b) xcons (SCHEME_A_ a, b)
1085#define immutable_cons(a,b) ximmutable_cons (SCHEME_A_ a, b)
1086
1087ecb_cold static pointer
1101generate_symbol (SCHEME_P_ const char *name) 1088generate_symbol (SCHEME_P_ const char *name)
1102{ 1089{
1103 pointer x = mk_string (SCHEME_A_ name); 1090 pointer x = mk_string (SCHEME_A_ name);
1104 setimmutable (x); 1091 setimmutable (x);
1105 set_typeflag (x, T_SYMBOL | T_ATOM); 1092 set_typeflag (x, T_SYMBOL | T_ATOM);
1106 return x; 1093 return x;
1107} 1094}
1108 1095
1096/* ========== oblist implementation ========== */
1097
1109#ifndef USE_OBJECT_LIST 1098#ifndef USE_OBJECT_LIST
1110 1099
1111static int 1100static int
1112hash_fn (const char *key, int table_size) 1101hash_fn (const char *key, int table_size)
1113{ 1102{
1114 const unsigned char *p = key; 1103 const unsigned char *p = (unsigned char *)key;
1115 uint32_t hash = 2166136261; 1104 uint32_t hash = 2166136261U;
1116 1105
1117 while (*p) 1106 while (*p)
1118 hash = (hash ^ *p++) * 16777619; 1107 hash = (hash ^ *p++) * 16777619;
1119 1108
1120 return hash % table_size; 1109 return hash % table_size;
1121} 1110}
1122 1111
1123static pointer 1112ecb_cold static pointer
1124oblist_initial_value (SCHEME_P) 1113oblist_initial_value (SCHEME_P)
1125{ 1114{
1126 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1115 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1127} 1116}
1128 1117
1129/* returns the new symbol */ 1118/* returns the new symbol */
1130static pointer 1119ecb_cold static pointer
1131oblist_add_by_name (SCHEME_P_ const char *name) 1120oblist_add_by_name (SCHEME_P_ const char *name)
1132{ 1121{
1133 pointer x = generate_symbol (SCHEME_A_ name); 1122 pointer x = generate_symbol (SCHEME_A_ name);
1134 int location = hash_fn (name, veclength (SCHEME_V->oblist)); 1123 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1135 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location))); 1124 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1136 return x; 1125 return x;
1137} 1126}
1138 1127
1139ecb_inline pointer 1128ecb_cold static pointer
1140oblist_find_by_name (SCHEME_P_ const char *name) 1129oblist_find_by_name (SCHEME_P_ const char *name)
1141{ 1130{
1142 int location; 1131 int location;
1143 pointer x; 1132 pointer x;
1144 char *s; 1133 char *s;
… …
1155 } 1144 }
1156 1145
1157 return NIL; 1146 return NIL;
1158} 1147}
1159 1148
1160static pointer 1149ecb_cold static pointer
1161oblist_all_symbols (SCHEME_P) 1150oblist_all_symbols (SCHEME_P)
1162{ 1151{
1163 int i; 1152 int i;
1164 pointer x; 1153 pointer x;
1165 pointer ob_list = NIL; 1154 pointer ob_list = NIL;
… …
1171 return ob_list; 1160 return ob_list;
1172} 1161}
1173 1162
1174#else 1163#else
1175 1164
1176static pointer 1165ecb_cold static pointer
1177oblist_initial_value (SCHEME_P) 1166oblist_initial_value (SCHEME_P)
1178{ 1167{
1179 return NIL; 1168 return NIL;
1180} 1169}
1181 1170
1182ecb_inline pointer 1171ecb_cold static pointer
1183oblist_find_by_name (SCHEME_P_ const char *name) 1172oblist_find_by_name (SCHEME_P_ const char *name)
1184{ 1173{
1185 pointer x; 1174 pointer x;
1186 char *s; 1175 char *s;
1187 1176
… …
1196 1185
1197 return NIL; 1186 return NIL;
1198} 1187}
1199 1188
1200/* returns the new symbol */ 1189/* returns the new symbol */
1201static pointer 1190ecb_cold static pointer
1202oblist_add_by_name (SCHEME_P_ const char *name) 1191oblist_add_by_name (SCHEME_P_ const char *name)
1203{ 1192{
1204 pointer x = mk_string (SCHEME_A_ name); 1193 pointer x = generate_symbol (SCHEME_A_ name);
1205 set_typeflag (x, T_SYMBOL);
1206 setimmutable (x);
1207 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1194 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1208 return x; 1195 return x;
1209} 1196}
1210 1197
1211static pointer 1198ecb_cold static pointer
1212oblist_all_symbols (SCHEME_P) 1199oblist_all_symbols (SCHEME_P)
1213{ 1200{
1214 return SCHEME_V->oblist; 1201 return SCHEME_V->oblist;
1215} 1202}
1216 1203
1217#endif 1204#endif
1218 1205
1219#if USE_PORTS
1220static pointer 1206ecb_cold static pointer
1221mk_port (SCHEME_P_ port *p) 1207mk_port (SCHEME_P_ port *p)
1222{ 1208{
1223 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1209 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1224 1210
1225 set_typeflag (x, T_PORT | T_ATOM); 1211 set_typeflag (x, T_PORT | T_ATOM);
1226 x->object.port = p; 1212 set_port (x, p);
1227 1213
1228 return x; 1214 return x;
1229} 1215}
1230#endif
1231 1216
1232pointer 1217ecb_cold pointer
1233mk_foreign_func (SCHEME_P_ foreign_func f) 1218mk_foreign_func (SCHEME_P_ foreign_func f)
1234{ 1219{
1235 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1220 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1236 1221
1237 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1222 set_typeflag (x, T_FOREIGN | T_ATOM);
1238 x->object.ff = f; 1223 CELL(x)->object.ff = f;
1239 1224
1240 return x; 1225 return x;
1241} 1226}
1242 1227
1243INTERFACE pointer 1228INTERFACE pointer
1244mk_character (SCHEME_P_ int c) 1229mk_character (SCHEME_P_ int c)
1245{ 1230{
1246 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1231 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1247 1232
1248 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1233 set_typeflag (x, T_CHARACTER | T_ATOM);
1249 set_ivalue (x, c & 0xff); 1234 set_ivalue (x, c & 0xff);
1250 1235
1251 return x; 1236 return x;
1252} 1237}
1253 1238
1254/* get number atom (integer) */ 1239/* get number atom (integer) */
1255INTERFACE pointer 1240INTERFACE pointer
1256mk_integer (SCHEME_P_ long n) 1241mk_integer (SCHEME_P_ long n)
1257{ 1242{
1243 pointer p = 0;
1244 pointer *pp = &p;
1245
1246#if USE_INTCACHE
1247 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1248 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1249#endif
1250
1251 if (!*pp)
1252 {
1258 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1253 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1259 1254
1260 set_typeflag (x, (T_INTEGER | T_ATOM)); 1255 set_typeflag (x, T_INTEGER | T_ATOM);
1256 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1261 set_ivalue (x, n); 1257 set_ivalue (x, n);
1262 1258
1259 *pp = x;
1260 }
1261
1263 return x; 1262 return *pp;
1264} 1263}
1265 1264
1266INTERFACE pointer 1265INTERFACE pointer
1267mk_real (SCHEME_P_ RVALUE n) 1266mk_real (SCHEME_P_ RVALUE n)
1268{ 1267{
1269#if USE_REAL 1268#if USE_REAL
1270 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1269 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1271 1270
1272 set_typeflag (x, (T_REAL | T_ATOM)); 1271 set_typeflag (x, T_REAL | T_ATOM);
1273 set_rvalue (x, n); 1272 set_rvalue (x, n);
1274 1273
1275 return x; 1274 return x;
1276#else 1275#else
1277 return mk_integer (SCHEME_A_ n); 1276 return mk_integer (SCHEME_A_ n);
… …
1388 x = oblist_add_by_name (SCHEME_A_ name); 1387 x = oblist_add_by_name (SCHEME_A_ name);
1389 1388
1390 return x; 1389 return x;
1391} 1390}
1392 1391
1393INTERFACE pointer 1392ecb_cold INTERFACE pointer
1394gensym (SCHEME_P) 1393gensym (SCHEME_P)
1395{ 1394{
1396 pointer x; 1395 pointer x;
1397 char name[40] = "gensym-"; 1396 char name[40] = "gensym-";
1398 xnum (name + 7, SCHEME_V->gensym_cnt); 1397 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1399 1398
1400 return generate_symbol (SCHEME_A_ name); 1399 return generate_symbol (SCHEME_A_ name);
1401} 1400}
1402 1401
1402static int
1403is_gensym (SCHEME_P_ pointer x)
1404{
1405 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1406}
1407
1403/* make symbol or number atom from string */ 1408/* make symbol or number atom from string */
1404static pointer 1409ecb_cold static pointer
1405mk_atom (SCHEME_P_ char *q) 1410mk_atom (SCHEME_P_ char *q)
1406{ 1411{
1407 char c, *p; 1412 char c, *p;
1408 int has_dec_point = 0; 1413 int has_dec_point = 0;
1409 int has_fp_exp = 0; 1414 int has_fp_exp = 0;
… …
1480 1485
1481 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1486 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1482} 1487}
1483 1488
1484/* make constant */ 1489/* make constant */
1485static pointer 1490ecb_cold static pointer
1486mk_sharp_const (SCHEME_P_ char *name) 1491mk_sharp_const (SCHEME_P_ char *name)
1487{ 1492{
1488 if (!strcmp (name, "t")) 1493 if (!strcmp (name, "t"))
1489 return S_T; 1494 return S_T;
1490 else if (!strcmp (name, "f")) 1495 else if (!strcmp (name, "f"))
1491 return S_F; 1496 return S_F;
1492 else if (*name == '\\') /* #\w (character) */ 1497 else if (*name == '\\') /* #\w (character) */
1493 { 1498 {
1494 int c; 1499 int c;
1495 1500
1501 // TODO: optimise
1496 if (stricmp (name + 1, "space") == 0) 1502 if (stricmp (name + 1, "space") == 0)
1497 c = ' '; 1503 c = ' ';
1498 else if (stricmp (name + 1, "newline") == 0) 1504 else if (stricmp (name + 1, "newline") == 0)
1499 c = '\n'; 1505 c = '\n';
1500 else if (stricmp (name + 1, "return") == 0) 1506 else if (stricmp (name + 1, "return") == 0)
1501 c = '\r'; 1507 c = '\r';
1502 else if (stricmp (name + 1, "tab") == 0) 1508 else if (stricmp (name + 1, "tab") == 0)
1503 c = '\t'; 1509 c = '\t';
1510 else if (stricmp (name + 1, "alarm") == 0)
1511 c = 0x07;
1512 else if (stricmp (name + 1, "backspace") == 0)
1513 c = 0x08;
1514 else if (stricmp (name + 1, "escape") == 0)
1515 c = 0x1b;
1516 else if (stricmp (name + 1, "delete") == 0)
1517 c = 0x7f;
1518 else if (stricmp (name + 1, "null") == 0)
1519 c = 0;
1504 else if (name[1] == 'x' && name[2] != 0) 1520 else if (name[1] == 'x' && name[2] != 0)
1505 { 1521 {
1506 long c1 = strtol (name + 2, 0, 16); 1522 long c1 = strtol (name + 2, 0, 16);
1507 1523
1508 if (0 <= c1 && c1 <= UCHAR_MAX) 1524 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1533 return NIL; 1549 return NIL;
1534 } 1550 }
1535} 1551}
1536 1552
1537/* ========== garbage collector ========== */ 1553/* ========== garbage collector ========== */
1554
1555static void
1556finalize_cell (SCHEME_P_ pointer a)
1557{
1558 /* TODO, fast bitmap check? */
1559 if (is_string (a) || is_symbol (a))
1560 free (strvalue (a));
1561 else if (is_vector (a))
1562 free (vecvalue (a));
1563#if USE_PORTS
1564 else if (is_port (a))
1565 {
1566 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1567 port_close (SCHEME_A_ a, port_input | port_output);
1568
1569 free (port (a));
1570 }
1571#endif
1572}
1538 1573
1539/*-- 1574/*--
1540 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1575 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1541 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1576 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1542 * for marking. 1577 * for marking.
1543 * 1578 *
1544 * The exception is vectors - vectors are currently marked recursively, 1579 * The exception is vectors - vectors are currently marked recursively,
1545 * which is inherited form tinyscheme and could be fixed by having another 1580 * which is inherited form tinyscheme and could be fixed by having another
1546 * word of context in the vector 1581 * word of context in the vector
1547 */ 1582 */
1548static void 1583ecb_hot static void
1549mark (pointer a) 1584mark (pointer a)
1550{ 1585{
1551 pointer t, q, p; 1586 pointer t, q, p;
1552 1587
1553 t = 0; 1588 t = 0;
… …
1610 p = q; 1645 p = q;
1611 goto E6; 1646 goto E6;
1612 } 1647 }
1613} 1648}
1614 1649
1650ecb_hot static void
1651gc_free (SCHEME_P)
1652{
1653 int i;
1654 uint32_t total = 0;
1655
1656 /* Here we scan the cells to build the free-list. */
1657 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1658 {
1659 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1660 struct cell *p;
1661 total += SCHEME_V->cell_segsize [i];
1662
1663 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1664 {
1665 pointer c = POINTER (p);
1666
1667 if (is_mark (c))
1668 clrmark (c);
1669 else
1670 {
1671 /* reclaim cell */
1672 if (typeflag (c) != T_PAIR)
1673 {
1674 finalize_cell (SCHEME_A_ c);
1675 set_typeflag (c, T_PAIR);
1676 set_car (c, NIL);
1677 }
1678
1679 ++SCHEME_V->fcells;
1680 set_cdr (c, SCHEME_V->free_cell);
1681 SCHEME_V->free_cell = c;
1682 }
1683 }
1684 }
1685
1686 if (SCHEME_V->gc_verbose)
1687 {
1688 putstr (SCHEME_A_ "done: "); putnum (SCHEME_A_ SCHEME_V->fcells); putstr (SCHEME_A_ " out of "); putnum (SCHEME_A_ total); putstr (SCHEME_A_ " cells were recovered.\n");
1689 }
1690}
1691
1615/* garbage collection. parameter a, b is marked. */ 1692/* garbage collection. parameter a, b is marked. */
1616static void 1693ecb_cold static void
1617gc (SCHEME_P_ pointer a, pointer b) 1694gc (SCHEME_P_ pointer a, pointer b)
1618{ 1695{
1619 pointer p;
1620 int i; 1696 int i;
1621 1697
1622 if (SCHEME_V->gc_verbose) 1698 if (SCHEME_V->gc_verbose)
1623 putstr (SCHEME_A_ "gc..."); 1699 putstr (SCHEME_A_ "gc...");
1624 1700
… …
1640 /* Mark recent objects the interpreter doesn't know about yet. */ 1716 /* Mark recent objects the interpreter doesn't know about yet. */
1641 mark (car (S_SINK)); 1717 mark (car (S_SINK));
1642 /* Mark any older stuff above nested C calls */ 1718 /* Mark any older stuff above nested C calls */
1643 mark (SCHEME_V->c_nest); 1719 mark (SCHEME_V->c_nest);
1644 1720
1721#if USE_INTCACHE
1722 /* mark intcache */
1723 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1724 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1725 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1726#endif
1727
1645 /* mark variables a, b */ 1728 /* mark variables a, b */
1646 mark (a); 1729 mark (a);
1647 mark (b); 1730 mark (b);
1648 1731
1649 /* garbage collect */ 1732 /* garbage collect */
1650 clrmark (NIL); 1733 clrmark (NIL);
1651 SCHEME_V->fcells = 0; 1734 SCHEME_V->fcells = 0;
1652 SCHEME_V->free_cell = NIL; 1735 SCHEME_V->free_cell = NIL;
1653 1736
1654 /* free-list is kept sorted by address so as to maintain consecutive
1655 ranges, if possible, for use with vectors. Here we scan the cells
1656 (which are also kept sorted by address) downwards to build the
1657 free-list in sorted order.
1658 */
1659 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1660 {
1661 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1662
1663 while (--p >= SCHEME_V->cell_seg[i])
1664 {
1665 if (is_mark (p))
1666 clrmark (p);
1667 else
1668 {
1669 /* reclaim cell */
1670 if (typeflag (p) != T_PAIR)
1671 {
1672 finalize_cell (SCHEME_A_ p);
1673 set_typeflag (p, T_PAIR);
1674 set_car (p, NIL);
1675 }
1676
1677 ++SCHEME_V->fcells;
1678 set_cdr (p, SCHEME_V->free_cell);
1679 SCHEME_V->free_cell = p;
1680 }
1681 }
1682 }
1683
1684 if (SCHEME_V->gc_verbose) 1737 if (SCHEME_V->gc_verbose)
1685 { 1738 putstr (SCHEME_A_ "freeing...");
1686 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1687 }
1688}
1689 1739
1690static void 1740 gc_free (SCHEME_A);
1691finalize_cell (SCHEME_P_ pointer a)
1692{
1693 /* TODO, fast bitmap check? */
1694 if (is_string (a) || is_symbol (a))
1695 free (strvalue (a));
1696 else if (is_vector (a))
1697 free (vecvalue (a));
1698#if USE_PORTS
1699 else if (is_port (a))
1700 {
1701 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1702 port_close (SCHEME_A_ a, port_input | port_output);
1703
1704 free (a->object.port);
1705 }
1706#endif
1707} 1741}
1708 1742
1709/* ========== Routines for Reading ========== */ 1743/* ========== Routines for Reading ========== */
1710 1744
1711static int 1745ecb_cold static int
1712file_push (SCHEME_P_ const char *fname) 1746file_push (SCHEME_P_ const char *fname)
1713{ 1747{
1714#if USE_PORTS
1715 int fin; 1748 int fin;
1716 1749
1717 if (SCHEME_V->file_i == MAXFIL - 1) 1750 if (SCHEME_V->file_i == MAXFIL - 1)
1718 return 0; 1751 return 0;
1719 1752
… …
1725 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1758 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1726 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1759 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1727 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1760 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1728 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1761 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1729 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1762 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1730 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1763 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1731 1764
1732#if SHOW_ERROR_LINE 1765#if SHOW_ERROR_LINE
1733 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1766 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1734 1767
1735 if (fname) 1768 if (fname)
1736 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0); 1769 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.filename = store_string (SCHEME_A_ strlen (fname), fname, 0);
1737#endif 1770#endif
1738 } 1771 }
1739 1772
1740 return fin >= 0; 1773 return fin >= 0;
1741
1742#else
1743 return 1;
1744#endif
1745} 1774}
1746 1775
1747static void 1776ecb_cold static void
1748file_pop (SCHEME_P) 1777file_pop (SCHEME_P)
1749{ 1778{
1750 if (SCHEME_V->file_i != 0) 1779 if (SCHEME_V->file_i != 0)
1751 { 1780 {
1752 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1781 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1753#if USE_PORTS 1782#if USE_PORTS
1754 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1783 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1755#endif 1784#endif
1756 SCHEME_V->file_i--; 1785 SCHEME_V->file_i--;
1757 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1786 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1758 } 1787 }
1759} 1788}
1760 1789
1761static int 1790ecb_cold static int
1762file_interactive (SCHEME_P) 1791file_interactive (SCHEME_P)
1763{ 1792{
1764#if USE_PORTS 1793#if USE_PORTS
1765 return SCHEME_V->file_i == 0 1794 return SCHEME_V->file_i == 0
1766 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1795 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1767 && (SCHEME_V->inport->object.port->kind & port_file); 1796 && (port (SCHEME_V->inport)->kind & port_file);
1768#else 1797#else
1769 return 0; 1798 return 0;
1770#endif 1799#endif
1771} 1800}
1772 1801
1773#if USE_PORTS 1802#if USE_PORTS
1774static port * 1803ecb_cold static port *
1775port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1804port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1776{ 1805{
1777 int fd; 1806 int fd;
1778 int flags; 1807 int flags;
1779 char *rw; 1808 char *rw;
… …
1802# endif 1831# endif
1803 1832
1804 return pt; 1833 return pt;
1805} 1834}
1806 1835
1807static pointer 1836ecb_cold static pointer
1808port_from_filename (SCHEME_P_ const char *fn, int prop) 1837port_from_filename (SCHEME_P_ const char *fn, int prop)
1809{ 1838{
1810 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1839 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1811 1840
1812 if (!pt && USE_ERROR_CHECKING) 1841 if (!pt && USE_ERROR_CHECKING)
1813 return NIL; 1842 return NIL;
1814 1843
1815 return mk_port (SCHEME_A_ pt); 1844 return mk_port (SCHEME_A_ pt);
1816} 1845}
1817 1846
1818static port * 1847ecb_cold static port *
1819port_rep_from_file (SCHEME_P_ int f, int prop) 1848port_rep_from_file (SCHEME_P_ int f, int prop)
1820{ 1849{
1821 port *pt = malloc (sizeof *pt); 1850 port *pt = malloc (sizeof *pt);
1822 1851
1823 if (!pt && USE_ERROR_CHECKING) 1852 if (!pt && USE_ERROR_CHECKING)
… …
1828 pt->rep.stdio.file = f; 1857 pt->rep.stdio.file = f;
1829 pt->rep.stdio.closeit = 0; 1858 pt->rep.stdio.closeit = 0;
1830 return pt; 1859 return pt;
1831} 1860}
1832 1861
1833static pointer 1862ecb_cold static pointer
1834port_from_file (SCHEME_P_ int f, int prop) 1863port_from_file (SCHEME_P_ int f, int prop)
1835{ 1864{
1836 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1865 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1837 1866
1838 if (!pt && USE_ERROR_CHECKING) 1867 if (!pt && USE_ERROR_CHECKING)
1839 return NIL; 1868 return NIL;
1840 1869
1841 return mk_port (SCHEME_A_ pt); 1870 return mk_port (SCHEME_A_ pt);
1842} 1871}
1843 1872
1844static port * 1873ecb_cold static port *
1845port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1874port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1846{ 1875{
1847 port *pt = malloc (sizeof (port)); 1876 port *pt = malloc (sizeof (port));
1848 1877
1849 if (!pt && USE_ERROR_CHECKING) 1878 if (!pt && USE_ERROR_CHECKING)
… …
1855 pt->rep.string.curr = start; 1884 pt->rep.string.curr = start;
1856 pt->rep.string.past_the_end = past_the_end; 1885 pt->rep.string.past_the_end = past_the_end;
1857 return pt; 1886 return pt;
1858} 1887}
1859 1888
1860static pointer 1889ecb_cold static pointer
1861port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1890port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1862{ 1891{
1863 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1892 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1864 1893
1865 if (!pt && USE_ERROR_CHECKING) 1894 if (!pt && USE_ERROR_CHECKING)
… …
1868 return mk_port (SCHEME_A_ pt); 1897 return mk_port (SCHEME_A_ pt);
1869} 1898}
1870 1899
1871# define BLOCK_SIZE 256 1900# define BLOCK_SIZE 256
1872 1901
1873static port * 1902ecb_cold static port *
1874port_rep_from_scratch (SCHEME_P) 1903port_rep_from_scratch (SCHEME_P)
1875{ 1904{
1876 char *start; 1905 char *start;
1877 port *pt = malloc (sizeof (port)); 1906 port *pt = malloc (sizeof (port));
1878 1907
… …
1892 pt->rep.string.curr = start; 1921 pt->rep.string.curr = start;
1893 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1922 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1894 return pt; 1923 return pt;
1895} 1924}
1896 1925
1897static pointer 1926ecb_cold static pointer
1898port_from_scratch (SCHEME_P) 1927port_from_scratch (SCHEME_P)
1899{ 1928{
1900 port *pt = port_rep_from_scratch (SCHEME_A); 1929 port *pt = port_rep_from_scratch (SCHEME_A);
1901 1930
1902 if (!pt && USE_ERROR_CHECKING) 1931 if (!pt && USE_ERROR_CHECKING)
1903 return NIL; 1932 return NIL;
1904 1933
1905 return mk_port (SCHEME_A_ pt); 1934 return mk_port (SCHEME_A_ pt);
1906} 1935}
1907 1936
1908static void 1937ecb_cold static void
1909port_close (SCHEME_P_ pointer p, int flag) 1938port_close (SCHEME_P_ pointer p, int flag)
1910{ 1939{
1911 port *pt = p->object.port; 1940 port *pt = port (p);
1912 1941
1913 pt->kind &= ~flag; 1942 pt->kind &= ~flag;
1914 1943
1915 if ((pt->kind & (port_input | port_output)) == 0) 1944 if ((pt->kind & (port_input | port_output)) == 0)
1916 { 1945 {
… …
1933 } 1962 }
1934} 1963}
1935#endif 1964#endif
1936 1965
1937/* get new character from input file */ 1966/* get new character from input file */
1938static int 1967ecb_cold static int
1939inchar (SCHEME_P) 1968inchar (SCHEME_P)
1940{ 1969{
1941 int c; 1970 int c;
1942 port *pt; 1971 port *pt = port (SCHEME_V->inport);
1943
1944 pt = SCHEME_V->inport->object.port;
1945 1972
1946 if (pt->kind & port_saw_EOF) 1973 if (pt->kind & port_saw_EOF)
1947 return EOF; 1974 return EOF;
1948 1975
1949 c = basic_inchar (pt); 1976 c = basic_inchar (pt);
… …
1959 } 1986 }
1960 1987
1961 return c; 1988 return c;
1962} 1989}
1963 1990
1964static int ungot = -1; 1991ecb_cold static int
1965
1966static int
1967basic_inchar (port *pt) 1992basic_inchar (port *pt)
1968{ 1993{
1969#if USE_PORTS
1970 if (pt->unget != -1) 1994 if (pt->unget != -1)
1971 { 1995 {
1972 int r = pt->unget; 1996 int r = pt->unget;
1973 pt->unget = -1; 1997 pt->unget = -1;
1974 return r; 1998 return r;
1975 } 1999 }
1976 2000
2001#if USE_PORTS
1977 if (pt->kind & port_file) 2002 if (pt->kind & port_file)
1978 { 2003 {
1979 char c; 2004 char c;
1980 2005
1981 if (!read (pt->rep.stdio.file, &c, 1)) 2006 if (!read (pt->rep.stdio.file, &c, 1))
… …
1989 return EOF; 2014 return EOF;
1990 else 2015 else
1991 return *pt->rep.string.curr++; 2016 return *pt->rep.string.curr++;
1992 } 2017 }
1993#else 2018#else
1994 if (ungot == -1)
1995 {
1996 char c; 2019 char c;
1997 if (!read (0, &c, 1)) 2020
2021 if (!read (pt->rep.stdio.file, &c, 1))
1998 return EOF; 2022 return EOF;
1999 2023
2000 ungot = c;
2001 }
2002
2003 {
2004 int r = ungot;
2005 ungot = -1;
2006 return r; 2024 return c;
2007 }
2008#endif 2025#endif
2009} 2026}
2010 2027
2011/* back character to input buffer */ 2028/* back character to input buffer */
2012static void 2029ecb_cold static void
2013backchar (SCHEME_P_ int c) 2030backchar (SCHEME_P_ int c)
2014{ 2031{
2015#if USE_PORTS 2032 port *pt = port (SCHEME_V->inport);
2016 port *pt;
2017 2033
2018 if (c == EOF) 2034 if (c == EOF)
2019 return; 2035 return;
2020 2036
2021 pt = SCHEME_V->inport->object.port;
2022 pt->unget = c; 2037 pt->unget = c;
2023#else
2024 if (c == EOF)
2025 return;
2026
2027 ungot = c;
2028#endif
2029} 2038}
2030 2039
2031#if USE_PORTS 2040#if USE_PORTS
2032static int 2041ecb_cold static int
2033realloc_port_string (SCHEME_P_ port *p) 2042realloc_port_string (SCHEME_P_ port *p)
2034{ 2043{
2035 char *start = p->rep.string.start; 2044 char *start = p->rep.string.start;
2036 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2045 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
2037 char *str = malloc (new_size); 2046 char *str = malloc (new_size);
… …
2050 else 2059 else
2051 return 0; 2060 return 0;
2052} 2061}
2053#endif 2062#endif
2054 2063
2055INTERFACE void 2064ecb_cold static void
2056putstr (SCHEME_P_ const char *s) 2065putchars (SCHEME_P_ const char *s, int len)
2057{ 2066{
2067 port *pt = port (SCHEME_V->outport);
2068
2058#if USE_PORTS 2069#if USE_PORTS
2059 port *pt = SCHEME_V->outport->object.port;
2060
2061 if (pt->kind & port_file)
2062 write (pt->rep.stdio.file, s, strlen (s));
2063 else
2064 for (; *s; s++)
2065 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2066 *pt->rep.string.curr++ = *s;
2067 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2068 *pt->rep.string.curr++ = *s;
2069
2070#else
2071 xwrstr (s);
2072#endif
2073}
2074
2075static void
2076putchars (SCHEME_P_ const char *s, int len)
2077{
2078#if USE_PORTS
2079 port *pt = SCHEME_V->outport->object.port;
2080
2081 if (pt->kind & port_file) 2070 if (pt->kind & port_file)
2082 write (pt->rep.stdio.file, s, len); 2071 write (pt->rep.stdio.file, s, len);
2083 else 2072 else
2084 { 2073 {
2085 for (; len; len--) 2074 for (; len; len--)
… …
2090 *pt->rep.string.curr++ = *s++; 2079 *pt->rep.string.curr++ = *s++;
2091 } 2080 }
2092 } 2081 }
2093 2082
2094#else 2083#else
2095 write (1, s, len); 2084 write (1, s, len); // output not initialised
2096#endif 2085#endif
2086}
2087
2088INTERFACE void
2089putstr (SCHEME_P_ const char *s)
2090{
2091 putchars (SCHEME_A_ s, strlen (s));
2097} 2092}
2098 2093
2099INTERFACE void 2094INTERFACE void
2100putcharacter (SCHEME_P_ int c) 2095putcharacter (SCHEME_P_ int c)
2101{ 2096{
2102#if USE_PORTS
2103 port *pt = SCHEME_V->outport->object.port;
2104
2105 if (pt->kind & port_file)
2106 {
2107 char cc = c;
2108 write (pt->rep.stdio.file, &cc, 1);
2109 }
2110 else
2111 {
2112 if (pt->rep.string.curr != pt->rep.string.past_the_end)
2113 *pt->rep.string.curr++ = c;
2114 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2115 *pt->rep.string.curr++ = c;
2116 }
2117
2118#else
2119 char cc = c; 2097 char cc = c;
2120 write (1, &c, 1); 2098
2121#endif 2099 putchars (SCHEME_A_ &cc, 1);
2122} 2100}
2123 2101
2124/* read characters up to delimiter, but cater to character constants */ 2102/* read characters up to delimiter, but cater to character constants */
2125static char * 2103ecb_cold static char *
2126readstr_upto (SCHEME_P_ int skip, const char *delim) 2104readstr_upto (SCHEME_P_ int skip, const char *delim)
2127{ 2105{
2128 char *p = SCHEME_V->strbuff + skip; 2106 char *p = SCHEME_V->strbuff + skip;
2129 2107
2130 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2108 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
… …
2139 2117
2140 return SCHEME_V->strbuff; 2118 return SCHEME_V->strbuff;
2141} 2119}
2142 2120
2143/* read string expression "xxx...xxx" */ 2121/* read string expression "xxx...xxx" */
2144static pointer 2122ecb_cold static pointer
2145readstrexp (SCHEME_P_ char delim) 2123readstrexp (SCHEME_P_ char delim)
2146{ 2124{
2147 char *p = SCHEME_V->strbuff; 2125 char *p = SCHEME_V->strbuff;
2148 int c; 2126 int c;
2149 int c1 = 0; 2127 int c1 = 0;
… …
2182 case '7': 2160 case '7':
2183 state = st_oct1; 2161 state = st_oct1;
2184 c1 = c - '0'; 2162 c1 = c - '0';
2185 break; 2163 break;
2186 2164
2165 case 'a': *p++ = '\a'; state = st_ok; break;
2166 case 'n': *p++ = '\n'; state = st_ok; break;
2167 case 'r': *p++ = '\r'; state = st_ok; break;
2168 case 't': *p++ = '\t'; state = st_ok; break;
2169
2170 // this overshoots the minimum requirements of r7rs
2171 case ' ':
2172 case '\t':
2173 case '\r':
2174 case '\n':
2175 skipspace (SCHEME_A);
2176 state = st_ok;
2177 break;
2178
2179 //TODO: x should end in ;, not two-digit hex
2187 case 'x': 2180 case 'x':
2188 case 'X': 2181 case 'X':
2189 state = st_x1; 2182 state = st_x1;
2190 c1 = 0; 2183 c1 = 0;
2191 break;
2192
2193 case 'n':
2194 *p++ = '\n';
2195 state = st_ok;
2196 break;
2197
2198 case 't':
2199 *p++ = '\t';
2200 state = st_ok;
2201 break;
2202
2203 case 'r':
2204 *p++ = '\r';
2205 state = st_ok;
2206 break; 2184 break;
2207 2185
2208 default: 2186 default:
2209 *p++ = c; 2187 *p++ = c;
2210 state = st_ok; 2188 state = st_ok;
… …
2262 } 2240 }
2263 } 2241 }
2264} 2242}
2265 2243
2266/* check c is in chars */ 2244/* check c is in chars */
2267ecb_inline int 2245ecb_cold int
2268is_one_of (const char *s, int c) 2246is_one_of (const char *s, int c)
2269{ 2247{
2270 return c == EOF || !!strchr (s, c); 2248 return c == EOF || !!strchr (s, c);
2271} 2249}
2272 2250
2273/* skip white characters */ 2251/* skip white characters */
2274ecb_inline int 2252ecb_cold int
2275skipspace (SCHEME_P) 2253skipspace (SCHEME_P)
2276{ 2254{
2277 int c, curr_line = 0; 2255 int c, curr_line = 0;
2278 2256
2279 do 2257 do
2280 { 2258 {
2281 c = inchar (SCHEME_A); 2259 c = inchar (SCHEME_A);
2260
2282#if SHOW_ERROR_LINE 2261#if SHOW_ERROR_LINE
2283 if (c == '\n') 2262 if (ecb_expect_false (c == '\n'))
2284 curr_line++; 2263 curr_line++;
2285#endif 2264#endif
2265
2266 if (ecb_expect_false (c == EOF))
2267 return c;
2286 } 2268 }
2287 while (is_one_of (WHITESPACE, c)); 2269 while (is_one_of (WHITESPACE, c));
2288 2270
2289 /* record it */ 2271 /* record it */
2290#if SHOW_ERROR_LINE 2272#if SHOW_ERROR_LINE
2291 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2273 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2292 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2274 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2293#endif 2275#endif
2294 2276
2295 if (c != EOF)
2296 {
2297 backchar (SCHEME_A_ c); 2277 backchar (SCHEME_A_ c);
2298 return 1; 2278 return 1;
2299 }
2300 else
2301 return EOF;
2302} 2279}
2303 2280
2304/* get token */ 2281/* get token */
2305static int 2282ecb_cold static int
2306token (SCHEME_P) 2283token (SCHEME_P)
2307{ 2284{
2308 int c = skipspace (SCHEME_A); 2285 int c = skipspace (SCHEME_A);
2309 2286
2310 if (c == EOF) 2287 if (c == EOF)
… …
2408} 2385}
2409 2386
2410/* ========== Routines for Printing ========== */ 2387/* ========== Routines for Printing ========== */
2411#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2388#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2412 2389
2413static void 2390ecb_cold static void
2414printslashstring (SCHEME_P_ char *p, int len) 2391printslashstring (SCHEME_P_ char *p, int len)
2415{ 2392{
2416 int i; 2393 int i;
2417 unsigned char *s = (unsigned char *) p; 2394 unsigned char *s = (unsigned char *) p;
2418 2395
… …
2474 2451
2475 putcharacter (SCHEME_A_ '"'); 2452 putcharacter (SCHEME_A_ '"');
2476} 2453}
2477 2454
2478/* print atoms */ 2455/* print atoms */
2479static void 2456ecb_cold static void
2480printatom (SCHEME_P_ pointer l, int f) 2457printatom (SCHEME_P_ pointer l, int f)
2481{ 2458{
2482 char *p; 2459 char *p;
2483 int len; 2460 int len;
2484 2461
2485 atom2str (SCHEME_A_ l, f, &p, &len); 2462 atom2str (SCHEME_A_ l, f, &p, &len);
2486 putchars (SCHEME_A_ p, len); 2463 putchars (SCHEME_A_ p, len);
2487} 2464}
2488 2465
2489/* Uses internal buffer unless string pointer is already available */ 2466/* Uses internal buffer unless string pointer is already available */
2490static void 2467ecb_cold static void
2491atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2468atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2492{ 2469{
2493 char *p; 2470 char *p;
2494 2471
2495 if (l == NIL) 2472 if (l == NIL)
… …
2702 return car (d); 2679 return car (d);
2703 2680
2704 p = cons (car (d), cdr (d)); 2681 p = cons (car (d), cdr (d));
2705 q = p; 2682 q = p;
2706 2683
2707 while (cdr (cdr (p)) != NIL) 2684 while (cddr (p) != NIL)
2708 { 2685 {
2709 d = cons (car (p), cdr (p)); 2686 d = cons (car (p), cdr (p));
2710 2687
2711 if (cdr (cdr (p)) != NIL) 2688 if (cddr (p) != NIL)
2712 p = cdr (d); 2689 p = cdr (d);
2713 } 2690 }
2714 2691
2715 set_cdr (p, car (cdr (p))); 2692 set_cdr (p, cadr (p));
2716 return q; 2693 return q;
2717} 2694}
2718 2695
2719/* reverse list -- produce new list */ 2696/* reverse list -- produce new list */
2720static pointer 2697ecb_hot static pointer
2721reverse (SCHEME_P_ pointer a) 2698reverse (SCHEME_P_ pointer a)
2722{ 2699{
2723 /* a must be checked by gc */ 2700 /* a must be checked by gc */
2724 pointer p = NIL; 2701 pointer p = NIL;
2725 2702
… …
2728 2705
2729 return p; 2706 return p;
2730} 2707}
2731 2708
2732/* reverse list --- in-place */ 2709/* reverse list --- in-place */
2733static pointer 2710ecb_hot static pointer
2734reverse_in_place (SCHEME_P_ pointer term, pointer list) 2711reverse_in_place (SCHEME_P_ pointer term, pointer list)
2735{ 2712{
2736 pointer result = term; 2713 pointer result = term;
2737 pointer p = list; 2714 pointer p = list;
2738 2715
… …
2746 2723
2747 return result; 2724 return result;
2748} 2725}
2749 2726
2750/* append list -- produce new list (in reverse order) */ 2727/* append list -- produce new list (in reverse order) */
2751static pointer 2728ecb_hot static pointer
2752revappend (SCHEME_P_ pointer a, pointer b) 2729revappend (SCHEME_P_ pointer a, pointer b)
2753{ 2730{
2754 pointer result = a; 2731 pointer result = a;
2755 pointer p = b; 2732 pointer p = b;
2756 2733
… …
2765 2742
2766 return S_F; /* signal an error */ 2743 return S_F; /* signal an error */
2767} 2744}
2768 2745
2769/* equivalence of atoms */ 2746/* equivalence of atoms */
2770int 2747ecb_hot int
2771eqv (pointer a, pointer b) 2748eqv (pointer a, pointer b)
2772{ 2749{
2773 if (is_string (a)) 2750 if (is_string (a))
2774 { 2751 {
2775 if (is_string (b)) 2752 if (is_string (b))
… …
2869 } 2846 }
2870 else 2847 else
2871 set_car (env, immutable_cons (slot, car (env))); 2848 set_car (env, immutable_cons (slot, car (env)));
2872} 2849}
2873 2850
2874static pointer 2851ecb_hot static pointer
2875find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2852find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2876{ 2853{
2877 pointer x, y; 2854 pointer x, y;
2878 2855
2879 for (x = env; x != NIL; x = cdr (x)) 2856 for (x = env; x != NIL; x = cdr (x))
… …
2900 return NIL; 2877 return NIL;
2901} 2878}
2902 2879
2903#else /* USE_ALIST_ENV */ 2880#else /* USE_ALIST_ENV */
2904 2881
2905ecb_inline void 2882static void
2906new_frame_in_env (SCHEME_P_ pointer old_env) 2883new_frame_in_env (SCHEME_P_ pointer old_env)
2907{ 2884{
2908 SCHEME_V->envir = immutable_cons (NIL, old_env); 2885 SCHEME_V->envir = immutable_cons (NIL, old_env);
2909 setenvironment (SCHEME_V->envir); 2886 setenvironment (SCHEME_V->envir);
2910} 2887}
2911 2888
2912ecb_inline void 2889static void
2913new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2890new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2914{ 2891{
2915 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2892 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2916} 2893}
2917 2894
2918static pointer 2895ecb_hot static pointer
2919find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2896find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2920{ 2897{
2921 pointer x, y; 2898 pointer x, y;
2922 2899
2923 for (x = env; x != NIL; x = cdr (x)) 2900 for (x = env; x != NIL; x = cdr (x))
… …
2937 return NIL; 2914 return NIL;
2938} 2915}
2939 2916
2940#endif /* USE_ALIST_ENV else */ 2917#endif /* USE_ALIST_ENV else */
2941 2918
2942ecb_inline void 2919static void
2943new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2920new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2944{ 2921{
2945 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2 2922 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2946 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2923 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2947} 2924}
2948 2925
2949ecb_inline void 2926static void
2950set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2927set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2951{ 2928{
2952 set_cdr (slot, value); 2929 set_cdr (slot, value);
2953} 2930}
2954 2931
2955ecb_inline pointer 2932static pointer
2956slot_value_in_env (pointer slot) 2933slot_value_in_env (pointer slot)
2957{ 2934{
2958 return cdr (slot); 2935 return cdr (slot);
2959} 2936}
2960 2937
2961/* ========== Evaluation Cycle ========== */ 2938/* ========== Evaluation Cycle ========== */
2962 2939
2963static int 2940ecb_cold static int
2964xError_1 (SCHEME_P_ const char *s, pointer a) 2941xError_1 (SCHEME_P_ const char *s, pointer a)
2965{ 2942{
2966#if USE_ERROR_HOOK
2967 pointer x;
2968 pointer hdl = SCHEME_V->ERROR_HOOK;
2969#endif
2970
2971#if USE_PRINTF 2943#if USE_PRINTF
2972#if SHOW_ERROR_LINE 2944#if SHOW_ERROR_LINE
2973 char sbuf[STRBUFFSIZE]; 2945 char sbuf[STRBUFFSIZE];
2974 2946
2975 /* make sure error is not in REPL */ 2947 /* make sure error is not in REPL */
… …
2990 } 2962 }
2991#endif 2963#endif
2992#endif 2964#endif
2993 2965
2994#if USE_ERROR_HOOK 2966#if USE_ERROR_HOOK
2995 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, hdl, 1); 2967 pointer x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->ERROR_HOOK, 1);
2996 2968
2997 if (x != NIL) 2969 if (x != NIL)
2998 { 2970 {
2999 pointer code = a 2971 pointer code = a
3000 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL) 2972 ? cons (cons (SCHEME_V->QUOTE, cons (a, NIL)), NIL)
… …
3044 pointer code; 3016 pointer code;
3045}; 3017};
3046 3018
3047# define STACK_GROWTH 3 3019# define STACK_GROWTH 3
3048 3020
3049static void 3021ecb_hot static void
3050s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3022s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3051{ 3023{
3052 int nframes = (uintptr_t)SCHEME_V->dump; 3024 int nframes = (uintptr_t)SCHEME_V->dump;
3053 struct dump_stack_frame *next_frame; 3025 struct dump_stack_frame *next_frame;
3054 3026
3055 /* enough room for the next frame? */ 3027 /* enough room for the next frame? */
3056 if (nframes >= SCHEME_V->dump_size) 3028 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3057 { 3029 {
3058 SCHEME_V->dump_size += STACK_GROWTH; 3030 SCHEME_V->dump_size += STACK_GROWTH;
3059 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3031 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3060 } 3032 }
3061 3033
… …
3067 next_frame->code = code; 3039 next_frame->code = code;
3068 3040
3069 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3041 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3070} 3042}
3071 3043
3072static int 3044static ecb_hot int
3073xs_return (SCHEME_P_ pointer a) 3045xs_return (SCHEME_P_ pointer a)
3074{ 3046{
3075 int nframes = (uintptr_t)SCHEME_V->dump; 3047 int nframes = (uintptr_t)SCHEME_V->dump;
3076 struct dump_stack_frame *frame; 3048 struct dump_stack_frame *frame;
3077 3049
… …
3088 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3060 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3089 3061
3090 return 0; 3062 return 0;
3091} 3063}
3092 3064
3093ecb_inline void 3065ecb_cold void
3094dump_stack_reset (SCHEME_P) 3066dump_stack_reset (SCHEME_P)
3095{ 3067{
3096 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3068 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3097 SCHEME_V->dump = (pointer)+0; 3069 SCHEME_V->dump = (pointer)+0;
3098} 3070}
3099 3071
3100ecb_inline void 3072ecb_cold void
3101dump_stack_initialize (SCHEME_P) 3073dump_stack_initialize (SCHEME_P)
3102{ 3074{
3103 SCHEME_V->dump_size = 0; 3075 SCHEME_V->dump_size = 0;
3104 SCHEME_V->dump_base = 0; 3076 SCHEME_V->dump_base = 0;
3105 dump_stack_reset (SCHEME_A); 3077 dump_stack_reset (SCHEME_A);
3106} 3078}
3107 3079
3108static void 3080ecb_cold static void
3109dump_stack_free (SCHEME_P) 3081dump_stack_free (SCHEME_P)
3110{ 3082{
3111 free (SCHEME_V->dump_base); 3083 free (SCHEME_V->dump_base);
3112 SCHEME_V->dump_base = 0; 3084 SCHEME_V->dump_base = 0;
3113 SCHEME_V->dump = (pointer)0; 3085 SCHEME_V->dump = (pointer)0;
3114 SCHEME_V->dump_size = 0; 3086 SCHEME_V->dump_size = 0;
3115} 3087}
3116 3088
3117static void 3089ecb_cold static void
3118dump_stack_mark (SCHEME_P) 3090dump_stack_mark (SCHEME_P)
3119{ 3091{
3120 int nframes = (uintptr_t)SCHEME_V->dump; 3092 int nframes = (uintptr_t)SCHEME_V->dump;
3121 int i; 3093 int i;
3122 3094
… …
3128 mark (frame->envir); 3100 mark (frame->envir);
3129 mark (frame->code); 3101 mark (frame->code);
3130 } 3102 }
3131} 3103}
3132 3104
3133static pointer 3105ecb_cold static pointer
3134ss_get_cont (SCHEME_P) 3106ss_get_cont (SCHEME_P)
3135{ 3107{
3136 int nframes = (uintptr_t)SCHEME_V->dump; 3108 int nframes = (uintptr_t)SCHEME_V->dump;
3137 int i; 3109 int i;
3138 3110
… …
3150 } 3122 }
3151 3123
3152 return cont; 3124 return cont;
3153} 3125}
3154 3126
3155static void 3127ecb_cold static void
3156ss_set_cont (SCHEME_P_ pointer cont) 3128ss_set_cont (SCHEME_P_ pointer cont)
3157{ 3129{
3158 int i = 0; 3130 int i = 0;
3159 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3131 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3160 3132
… …
3172 SCHEME_V->dump = (pointer)(uintptr_t)i; 3144 SCHEME_V->dump = (pointer)(uintptr_t)i;
3173} 3145}
3174 3146
3175#else 3147#else
3176 3148
3177ecb_inline void 3149ecb_cold void
3178dump_stack_reset (SCHEME_P) 3150dump_stack_reset (SCHEME_P)
3179{ 3151{
3180 SCHEME_V->dump = NIL; 3152 SCHEME_V->dump = NIL;
3181} 3153}
3182 3154
3183ecb_inline void 3155ecb_cold void
3184dump_stack_initialize (SCHEME_P) 3156dump_stack_initialize (SCHEME_P)
3185{ 3157{
3186 dump_stack_reset (SCHEME_A); 3158 dump_stack_reset (SCHEME_A);
3187} 3159}
3188 3160
3189static void 3161ecb_cold static void
3190dump_stack_free (SCHEME_P) 3162dump_stack_free (SCHEME_P)
3191{ 3163{
3192 SCHEME_V->dump = NIL; 3164 SCHEME_V->dump = NIL;
3193} 3165}
3194 3166
3195static int 3167ecb_hot static int
3196xs_return (SCHEME_P_ pointer a) 3168xs_return (SCHEME_P_ pointer a)
3197{ 3169{
3198 pointer dump = SCHEME_V->dump; 3170 pointer dump = SCHEME_V->dump;
3199 3171
3200 SCHEME_V->value = a; 3172 SCHEME_V->value = a;
… …
3210 SCHEME_V->dump = dump; 3182 SCHEME_V->dump = dump;
3211 3183
3212 return 0; 3184 return 0;
3213} 3185}
3214 3186
3215static void 3187ecb_hot static void
3216s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3188s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3217{ 3189{
3218 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3190 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3219 cons (args, 3191 cons (args,
3220 cons (SCHEME_V->envir, 3192 cons (SCHEME_V->envir,
3221 cons (code, 3193 cons (code,
3222 SCHEME_V->dump)))); 3194 SCHEME_V->dump))));
3223} 3195}
3224 3196
3225static void 3197ecb_cold static void
3226dump_stack_mark (SCHEME_P) 3198dump_stack_mark (SCHEME_P)
3227{ 3199{
3228 mark (SCHEME_V->dump); 3200 mark (SCHEME_V->dump);
3229} 3201}
3230 3202
3231static pointer 3203ecb_cold static pointer
3232ss_get_cont (SCHEME_P) 3204ss_get_cont (SCHEME_P)
3233{ 3205{
3234 return SCHEME_V->dump; 3206 return SCHEME_V->dump;
3235} 3207}
3236 3208
3237static void 3209ecb_cold static void
3238ss_set_cont (SCHEME_P_ pointer cont) 3210ss_set_cont (SCHEME_P_ pointer cont)
3239{ 3211{
3240 SCHEME_V->dump = cont; 3212 SCHEME_V->dump = cont;
3241} 3213}
3242 3214
3243#endif 3215#endif
3244 3216
3245#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3217#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3246 3218
3247#if 1 3219#if EXPERIMENT
3220
3248static int 3221static int
3249debug (SCHEME_P_ int indent, pointer x) 3222dtree (SCHEME_P_ int indent, pointer x)
3250{ 3223{
3251 int c; 3224 int c;
3252 3225
3253 if (is_syntax (x)) 3226 if (is_syntax (x))
3254 { 3227 {
… …
3272 printf ("%*sS<%s>\n", indent, "", symname (x)); 3245 printf ("%*sS<%s>\n", indent, "", symname (x));
3273 return 24+8; 3246 return 24+8;
3274 3247
3275 case T_CLOSURE: 3248 case T_CLOSURE:
3276 printf ("%*sS<%s>\n", indent, "", "closure"); 3249 printf ("%*sS<%s>\n", indent, "", "closure");
3277 debug (SCHEME_A_ indent + 3, cdr(x)); 3250 dtree (SCHEME_A_ indent + 3, cdr(x));
3278 return 32 + debug (SCHEME_A_ indent + 3, car (x)); 3251 return 32 + dtree (SCHEME_A_ indent + 3, car (x));
3279 3252
3280 case T_PAIR: 3253 case T_PAIR:
3281 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x)); 3254 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3282 c = debug (SCHEME_A_ indent + 3, car (x)); 3255 c = dtree (SCHEME_A_ indent + 3, car (x));
3283 c += debug (SCHEME_A_ indent + 3, cdr (x)); 3256 c += dtree (SCHEME_A_ indent + 3, cdr (x));
3284 return c + 1; 3257 return c + 1;
3285 3258
3286 case T_PORT: 3259 case T_PORT:
3287 printf ("%*sS<%s>\n", indent, "", "port"); 3260 printf ("%*sS<%s>\n", indent, "", "port");
3288 return 24+8; 3261 return 24+8;
… …
3291 printf ("%*sS<%s>\n", indent, "", "vector"); 3264 printf ("%*sS<%s>\n", indent, "", "vector");
3292 return 24+8; 3265 return 24+8;
3293 3266
3294 case T_ENVIRONMENT: 3267 case T_ENVIRONMENT:
3295 printf ("%*sS<%s>\n", indent, "", "environment"); 3268 printf ("%*sS<%s>\n", indent, "", "environment");
3296 return 0 + debug (SCHEME_A_ indent + 3, car (x)); 3269 return 0 + dtree (SCHEME_A_ indent + 3, car (x));
3297 3270
3298 default: 3271 default:
3299 printf ("unhandled type %d\n", type (x)); 3272 printf ("unhandled type %d\n", type (x));
3300 break; 3273 break;
3301 } 3274 }
3302} 3275}
3303#endif
3304 3276
3277#define DUMP(t) do { printf ("DUMP %s:%d\n", __FILE__, __LINE__); dtree (SCHEME_A_ 0, (t)); } while (0)
3278
3279typedef void *stream[1];
3280
3281#define stream_init() { 0 }
3282#define stream_data(s) ((char *)(s)[0] + sizeof (uint32_t) * 2)
3283#define stream_size(s) (((uint32_t *)(s)[0])[0] - sizeof (uint32_t) * 2)
3284#define stream_free(s) free (s[0])
3285
3286ecb_cold static void
3287stream_put (stream s, uint8_t byte)
3288{
3289 uint32_t *sp = *s;
3290 uint32_t size = sizeof (uint32_t) * 2;
3291 uint32_t offs = size;
3292
3293 if (ecb_expect_true (sp))
3294 {
3295 offs = sp[0];
3296 size = sp[1];
3297 }
3298
3299 if (ecb_expect_false (offs == size))
3300 {
3301 size *= 2;
3302 sp = realloc (sp, size);
3303 *s = sp;
3304 sp[1] = size;
3305
3306 }
3307
3308 ((uint8_t *)sp)[offs++] = byte;
3309 sp[0] = offs;
3310}
3311
3312ecb_cold static void
3313stream_put_v (stream s, uint32_t v)
3314{
3315 while (v > 0x7f)
3316 {
3317 stream_put (s, v | 0x80);
3318 v >>= 7;
3319 }
3320
3321 stream_put (s, v);
3322}
3323
3324ecb_cold static void
3325stream_put_tv (stream s, int bop, uint32_t v)
3326{
3327 printf ("put tv %d %d\n", bop, v);//D
3328 stream_put (s, bop);
3329 stream_put_v (s, v);
3330}
3331
3332ecb_cold static void
3333stream_put_stream (stream s, stream o)
3334{
3335 uint32_t i;
3336
3337 for (i = 0; i < stream_size (o); ++i)
3338 stream_put (s, stream_data (o)[i]);
3339
3340 stream_free (o);
3341}
3342
3343// calculates a (preferably small) integer that makes it possible to find
3344// the symbol again. if pointers were offsets into a memory area... until
3345// then, we return segment number in the low bits, and offset in the high
3346// bits.
3347// also, this function must never return 0.
3348ecb_cold static uint32_t
3349symbol_id (SCHEME_P_ pointer sym)
3350{
3351 struct cell *p = CELL (sym);
3352 int i;
3353
3354 for (i = SCHEME_V->last_cell_seg; i >= 0; --i)
3355 if (SCHEME_V->cell_seg[i] <= p && p < SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize[i])
3356 return i | ((p - SCHEME_V->cell_seg[i]) << CELL_NSEGMENT_LOG);
3357
3358 abort ();
3359}
3360
3361ecb_cold static uint32_t
3362cell_id (SCHEME_P_ pointer p)
3363{
3364 return symbol_id (SCHEME_A_ p);
3365}
3366
3367enum byteop
3368{
3369 BOP_NIL,
3370 BOP_SYNTAX,
3371 BOP_INTEGER,
3372 BOP_SYMBOL,
3373 BOP_LIST_BEG,
3374 BOP_LIST_END,
3375 BOP_BIFT, // branch if true
3376 BOP_BIFF, // branch if false
3377 BOP_BIFNE, // branch if not eqv?
3378 BOP_BRA, // "short" branch
3379 BOP_JMP, // "long" jump
3380 BOP_DATUM,
3381 BOP_LET,
3382 BOP_LETAST,
3383 BOP_LETREC,
3384 BOP_DEFINE,
3385 BOP_MACRO,
3386 BOP_SET,
3387 BOP_BEGIN,
3388 BOP_LAMBDA,
3389};
3390
3391ecb_cold static void compile_expr (SCHEME_P_ stream s, pointer x);
3392
3393ecb_cold static void
3394compile_list (SCHEME_P_ stream s, pointer x)
3395{
3396 for (; x != NIL; x = cdr (x))
3397 compile_expr (SCHEME_A_ s, car (x));
3398}
3399
3305static int 3400static void
3401compile_if (SCHEME_P_ stream s, pointer cond, pointer ift, pointer iff)
3402{
3403 //TODO: borked
3404 stream sift = stream_init (); compile_expr (SCHEME_A_ sift, ift);
3405
3406 stream_put (s, BOP_BIFF);
3407 compile_expr (SCHEME_A_ s, cond);
3408 stream_put_v (s, stream_size (sift));
3409 stream_put_stream (s, sift);
3410
3411 if (iff != NIL)
3412 {
3413 stream siff = stream_init (); compile_expr (SCHEME_A_ siff, iff);
3414 stream_put_tv (s, BOP_BRA, stream_size (siff));
3415 stream_put_stream (s, siff);
3416 }
3417}
3418
3419typedef uint32_t stream_fixup;
3420
3421static stream_fixup
3422stream_put_fixup (stream s)
3423{
3424 stream_put (s, 0);
3425 stream_put (s, 0);
3426
3427 return stream_size (s);
3428}
3429
3430static void
3431stream_fix_fixup (stream s, stream_fixup fixup, uint32_t target)
3432{
3433 target -= fixup;
3434 assert (target < (1 << 14));
3435 stream_data (s)[fixup - 2] = target | 0x80;
3436 stream_data (s)[fixup - 1] = target >> 7;
3437}
3438
3439static void
3440compile_and_or (SCHEME_P_ stream s, int and, pointer x)
3441{
3442 if (cdr (x) == NIL)
3443 compile_expr (SCHEME_A_ s, car (x));
3444 else
3445 {
3446 stream_put (s, and ? BOP_BIFF : BOP_BIFT);
3447 compile_expr (SCHEME_A_ s, car (x));
3448 stream_fixup end = stream_put_fixup (s);
3449
3450 compile_and_or (SCHEME_A_ s, and, cdr (x));
3451 stream_fix_fixup (s, end, stream_size (s));
3452 }
3453}
3454
3455ecb_cold static void
3456compile_expr (SCHEME_P_ stream s, pointer x)
3457{
3458 if (x == NIL)
3459 {
3460 stream_put (s, BOP_NIL);
3461 return;
3462 }
3463
3464 if (is_pair (x))
3465 {
3466 pointer head = car (x);
3467
3468 if (is_syntax (head))
3469 {
3470 x = cdr (x);
3471
3472 switch (syntaxnum (head))
3473 {
3474 case OP_IF0: /* if */
3475 compile_if (SCHEME_A_ s, car (x), cadr (x), caddr (x));
3476 break;
3477
3478 case OP_OR0: /* or */
3479 compile_and_or (SCHEME_A_ s, 0, x);
3480 break;
3481
3482 case OP_AND0: /* and */
3483 compile_and_or (SCHEME_A_ s, 1, x);
3484 break;
3485
3486 case OP_CASE0: /* case */
3487 abort ();
3488 break;
3489
3490 case OP_COND0: /* cond */
3491 abort ();
3492 break;
3493
3494 case OP_LET0: /* let */
3495 case OP_LET0AST: /* let* */
3496 case OP_LET0REC: /* letrec */
3497 switch (syntaxnum (head))
3498 {
3499 case OP_LET0: stream_put (s, BOP_LET ); break;
3500 case OP_LET0AST: stream_put (s, BOP_LETAST); break;
3501 case OP_LET0REC: stream_put (s, BOP_LETREC); break;
3502 }
3503
3504 {
3505 pointer bindings = car (x);
3506 pointer body = cadr (x);
3507
3508 for (x = bindings; x != NIL; x = cdr (x))
3509 {
3510 pointer init = NIL;
3511 pointer var = car (x);
3512
3513 if (is_pair (var))
3514 {
3515 init = cdr (var);
3516 var = car (var);
3517 }
3518
3519 stream_put_v (s, symbol_id (SCHEME_A_ var));
3520 compile_expr (SCHEME_A_ s, init);
3521 }
3522
3523 stream_put_v (s, 0);
3524 compile_expr (SCHEME_A_ s, body);
3525 }
3526 break;
3527
3528 case OP_DEF0: /* define */
3529 case OP_MACRO0: /* macro */
3530 stream_put (s, syntaxnum (head) == OP_DEF0 ? BOP_DEFINE : BOP_MACRO);
3531 stream_put_v (s, cell_id (SCHEME_A_ car (x)));
3532 compile_expr (SCHEME_A_ s, cadr (x));
3533 break;
3534
3535 case OP_SET0: /* set! */
3536 stream_put (s, BOP_SET);
3537 stream_put_v (s, symbol_id (SCHEME_A_ car (x)));
3538 compile_expr (SCHEME_A_ s, cadr (x));
3539 break;
3540
3541 case OP_BEGIN: /* begin */
3542 stream_put (s, BOP_BEGIN);
3543 compile_list (SCHEME_A_ s, x);
3544 return;
3545
3546 case OP_DELAY: /* delay */
3547 abort ();
3548 break;
3549
3550 case OP_QUOTE: /* quote */
3551 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3552 break;
3553
3554 case OP_LAMBDA: /* lambda */
3555 {
3556 pointer formals = car (x);
3557 pointer body = cadr (x);
3558
3559 stream_put (s, BOP_LAMBDA);
3560
3561 for (; is_pair (formals); formals = cdr (formals))
3562 stream_put_v (s, symbol_id (SCHEME_A_ car (formals)));
3563
3564 stream_put_v (s, 0);
3565 stream_put_v (s, formals == NIL ? 0 : symbol_id (SCHEME_A_ formals));
3566
3567 compile_expr (SCHEME_A_ s, body);
3568 }
3569 break;
3570
3571 case OP_C0STREAM:/* cons-stream */
3572 abort ();
3573 break;
3574 }
3575
3576 return;
3577 }
3578
3579 pointer m = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, head, 1);
3580
3581 if (m != NIL)
3582 {
3583 m = slot_value_in_env (m);
3584
3585 if (is_macro (m))
3586 {
3587 s_save (SCHEME_A_ OP_DEBUG2, SCHEME_V->args, SCHEME_V->code);
3588 SCHEME_V->code = m;
3589 SCHEME_V->args = cons (x, NIL);
3590 Eval_Cycle (SCHEME_A_ OP_APPLY);
3591 x = SCHEME_V->value;
3592 compile_expr (SCHEME_A_ s, SCHEME_V->value);
3593 return;
3594 }
3595 }
3596 }
3597
3598 switch (type (x))
3599 {
3600 case T_INTEGER:
3601 {
3602 IVALUE iv = ivalue_unchecked (x);
3603 iv = iv < 0 ? ((uint32_t)-iv << 1) | 1 : (uint32_t)iv << 1;
3604 stream_put_tv (s, BOP_INTEGER, iv);
3605 }
3606 return;
3607
3608 case T_SYMBOL:
3609 stream_put_tv (s, BOP_SYMBOL, symbol_id (SCHEME_A_ x));
3610 return;
3611
3612 case T_PAIR:
3613 stream_put (s, BOP_LIST_BEG);
3614
3615 for (; x != NIL; x = cdr (x))
3616 compile_expr (SCHEME_A_ s, car (x));
3617
3618 stream_put (s, BOP_LIST_END);
3619 return;
3620
3621 default:
3622 stream_put_tv (s, BOP_DATUM, cell_id (SCHEME_A_ x));
3623 break;
3624 }
3625}
3626
3627ecb_cold static int
3628compile_closure (SCHEME_P_ pointer p)
3629{
3630 stream s = stream_init ();
3631
3632 compile_list (SCHEME_A_ s, cdar (p));
3633
3634 FILE *xxd = popen ("xxd", "we");
3635 fwrite (stream_data (s), 1, stream_size (s), xxd);
3636 fclose (xxd);
3637
3638 return stream_size (s);
3639}
3640
3641#endif
3642
3643/* syntax, eval, core, ... */
3644ecb_hot static int
3306opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3645opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3307{ 3646{
3308 pointer args = SCHEME_V->args; 3647 pointer args = SCHEME_V->args;
3309 pointer x, y; 3648 pointer x, y;
3310 3649
3311 switch (op) 3650 switch (op)
3312 { 3651 {
3313#if 1 //D 3652#if EXPERIMENT //D
3314 case OP_DEBUG: 3653 case OP_DEBUG:
3315 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8); 3654 {
3655 uint32_t len = compile_closure (SCHEME_A_ car (args));
3656 printf ("len = %d\n", len);
3316 printf ("\n"); 3657 printf ("\n");
3317 s_return (S_T); 3658 s_return (S_T);
3659 }
3660
3661 case OP_DEBUG2:
3662 return -1;
3318#endif 3663#endif
3664
3319 case OP_LOAD: /* load */ 3665 case OP_LOAD: /* load */
3320 if (file_interactive (SCHEME_A)) 3666 if (file_interactive (SCHEME_A))
3321 { 3667 {
3322 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3668 putstr (SCHEME_A_ "Loading ");
3323 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3669 putstr (SCHEME_A_ strvalue (car (args)));
3670 putcharacter (SCHEME_A_ '\n');
3324 } 3671 }
3325 3672
3326 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3673 if (!file_push (SCHEME_A_ strvalue (car (args))))
3327 Error_1 ("unable to open", car (args)); 3674 Error_1 ("unable to open", car (args));
3328 else 3675
3329 {
3330 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 3676 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
3331 s_goto (OP_T0LVL); 3677 s_goto (OP_T0LVL);
3332 }
3333 3678
3334 case OP_T0LVL: /* top level */ 3679 case OP_T0LVL: /* top level */
3335 3680
3336 /* If we reached the end of file, this loop is done. */ 3681 /* If we reached the end of file, this loop is done. */
3337 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3682 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3338 { 3683 {
3339 if (SCHEME_V->file_i == 0) 3684 if (SCHEME_V->file_i == 0)
3340 { 3685 {
3341 SCHEME_V->args = NIL; 3686 SCHEME_V->args = NIL;
3342 s_goto (OP_QUIT); 3687 s_goto (OP_QUIT);
… …
3353 /* If interactive, be nice to user. */ 3698 /* If interactive, be nice to user. */
3354 if (file_interactive (SCHEME_A)) 3699 if (file_interactive (SCHEME_A))
3355 { 3700 {
3356 SCHEME_V->envir = SCHEME_V->global_env; 3701 SCHEME_V->envir = SCHEME_V->global_env;
3357 dump_stack_reset (SCHEME_A); 3702 dump_stack_reset (SCHEME_A);
3358 putstr (SCHEME_A_ "\n"); 3703 putcharacter (SCHEME_A_ '\n');
3704#if EXPERIMENT
3705 system ("ps v $PPID");
3706#endif
3359 putstr (SCHEME_A_ prompt); 3707 putstr (SCHEME_A_ prompt);
3360 } 3708 }
3361 3709
3362 /* Set up another iteration of REPL */ 3710 /* Set up another iteration of REPL */
3363 SCHEME_V->nesting = 0; 3711 SCHEME_V->nesting = 0;
… …
3398 { 3746 {
3399 SCHEME_V->print_flag = 1; 3747 SCHEME_V->print_flag = 1;
3400 SCHEME_V->args = SCHEME_V->value; 3748 SCHEME_V->args = SCHEME_V->value;
3401 s_goto (OP_P0LIST); 3749 s_goto (OP_P0LIST);
3402 } 3750 }
3403 else 3751
3404 s_return (SCHEME_V->value); 3752 s_return (SCHEME_V->value);
3405 3753
3406 case OP_EVAL: /* main part of evaluation */ 3754 case OP_EVAL: /* main part of evaluation */
3407#if USE_TRACING 3755#if USE_TRACING
3408 if (SCHEME_V->tracing) 3756 if (SCHEME_V->tracing)
3409 { 3757 {
… …
3420#endif 3768#endif
3421 if (is_symbol (SCHEME_V->code)) /* symbol */ 3769 if (is_symbol (SCHEME_V->code)) /* symbol */
3422 { 3770 {
3423 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3771 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3424 3772
3425 if (x != NIL) 3773 if (x == NIL)
3426 s_return (slot_value_in_env (x));
3427 else
3428 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3774 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3775
3776 s_return (slot_value_in_env (x));
3429 } 3777 }
3430 else if (is_pair (SCHEME_V->code)) 3778 else if (is_pair (SCHEME_V->code))
3431 { 3779 {
3432 x = car (SCHEME_V->code); 3780 x = car (SCHEME_V->code);
3433 3781
… …
3442 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */ 3790 /* If no macros => s_save(SCHEME_A_ OP_E1ARGS, NIL, cdr(SCHEME_V->code)); */
3443 SCHEME_V->code = x; 3791 SCHEME_V->code = x;
3444 s_goto (OP_EVAL); 3792 s_goto (OP_EVAL);
3445 } 3793 }
3446 } 3794 }
3447 else 3795
3448 s_return (SCHEME_V->code); 3796 s_return (SCHEME_V->code);
3449 3797
3450 case OP_E0ARGS: /* eval arguments */ 3798 case OP_E0ARGS: /* eval arguments */
3451 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */ 3799 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3452 { 3800 {
3453 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3801 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3454 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3802 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3455 SCHEME_V->code = SCHEME_V->value; 3803 SCHEME_V->code = SCHEME_V->value;
3456 s_goto (OP_APPLY); 3804 s_goto (OP_APPLY);
3457 } 3805 }
3458 else 3806
3459 {
3460 SCHEME_V->code = cdr (SCHEME_V->code); 3807 SCHEME_V->code = cdr (SCHEME_V->code);
3461 s_goto (OP_E1ARGS); 3808 s_goto (OP_E1ARGS);
3462 }
3463 3809
3464 case OP_E1ARGS: /* eval arguments */ 3810 case OP_E1ARGS: /* eval arguments */
3465 args = cons (SCHEME_V->value, args); 3811 args = cons (SCHEME_V->value, args);
3466 3812
3467 if (is_pair (SCHEME_V->code)) /* continue */ 3813 if (is_pair (SCHEME_V->code)) /* continue */
… …
3478 SCHEME_V->args = cdr (args); 3824 SCHEME_V->args = cdr (args);
3479 s_goto (OP_APPLY); 3825 s_goto (OP_APPLY);
3480 } 3826 }
3481 3827
3482#if USE_TRACING 3828#if USE_TRACING
3483
3484 case OP_TRACING: 3829 case OP_TRACING:
3485 { 3830 {
3486 int tr = SCHEME_V->tracing; 3831 int tr = SCHEME_V->tracing;
3487 3832
3488 SCHEME_V->tracing = ivalue_unchecked (car (args)); 3833 SCHEME_V->tracing = ivalue_unchecked (car (args));
3489 s_return (mk_integer (SCHEME_A_ tr)); 3834 s_return (mk_integer (SCHEME_A_ tr));
3490 } 3835 }
3491
3492#endif 3836#endif
3493 3837
3494 case OP_APPLY: /* apply 'code' to 'args' */ 3838 case OP_APPLY: /* apply 'code' to 'args' */
3495#if USE_TRACING 3839#if USE_TRACING
3496 if (SCHEME_V->tracing) 3840 if (SCHEME_V->tracing)
… …
3510 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3854 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3511 else if (is_foreign (SCHEME_V->code)) 3855 else if (is_foreign (SCHEME_V->code))
3512 { 3856 {
3513 /* Keep nested calls from GC'ing the arglist */ 3857 /* Keep nested calls from GC'ing the arglist */
3514 push_recent_alloc (SCHEME_A_ args, NIL); 3858 push_recent_alloc (SCHEME_A_ args, NIL);
3515 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3859 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3516 3860
3517 s_return (x); 3861 s_return (x);
3518 } 3862 }
3519 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3863 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3520 { 3864 {
… …
3550 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */ 3894 else if (is_continuation (SCHEME_V->code)) /* CONTINUATION */
3551 { 3895 {
3552 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code)); 3896 ss_set_cont (SCHEME_A_ cont_dump (SCHEME_V->code));
3553 s_return (args != NIL ? car (args) : NIL); 3897 s_return (args != NIL ? car (args) : NIL);
3554 } 3898 }
3555 else 3899
3556 Error_0 ("illegal function"); 3900 Error_0 ("illegal function");
3557 3901
3558 case OP_DOMACRO: /* do macro */ 3902 case OP_DOMACRO: /* do macro */
3559 SCHEME_V->code = SCHEME_V->value; 3903 SCHEME_V->code = SCHEME_V->value;
3560 s_goto (OP_EVAL); 3904 s_goto (OP_EVAL);
3561
3562#if 1
3563 3905
3564 case OP_LAMBDA: /* lambda */ 3906 case OP_LAMBDA: /* lambda */
3565 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3907 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3566 set SCHEME_V->value fall thru */ 3908 set SCHEME_V->value fall thru */
3567 { 3909 {
… …
3574 SCHEME_V->code = slot_value_in_env (f); 3916 SCHEME_V->code = slot_value_in_env (f);
3575 s_goto (OP_APPLY); 3917 s_goto (OP_APPLY);
3576 } 3918 }
3577 3919
3578 SCHEME_V->value = SCHEME_V->code; 3920 SCHEME_V->value = SCHEME_V->code;
3579 /* Fallthru */
3580 } 3921 }
3922 /* Fallthru */
3581 3923
3582 case OP_LAMBDA1: 3924 case OP_LAMBDA1:
3583 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3925 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3584
3585#else
3586
3587 case OP_LAMBDA: /* lambda */
3588 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3589
3590#endif
3591 3926
3592 case OP_MKCLOSURE: /* make-closure */ 3927 case OP_MKCLOSURE: /* make-closure */
3593 x = car (args); 3928 x = car (args);
3594 3929
3595 if (car (x) == SCHEME_V->LAMBDA) 3930 if (car (x) == SCHEME_V->LAMBDA)
… …
3634 else 3969 else
3635 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value); 3970 new_slot_in_env (SCHEME_A_ SCHEME_V->code, SCHEME_V->value);
3636 3971
3637 s_return (SCHEME_V->code); 3972 s_return (SCHEME_V->code);
3638 3973
3639
3640 case OP_DEFP: /* defined? */ 3974 case OP_DEFP: /* defined? */
3641 x = SCHEME_V->envir; 3975 x = SCHEME_V->envir;
3642 3976
3643 if (cdr (args) != NIL) 3977 if (cdr (args) != NIL)
3644 x = cadr (args); 3978 x = cadr (args);
… …
3662 s_return (SCHEME_V->value); 3996 s_return (SCHEME_V->value);
3663 } 3997 }
3664 else 3998 else
3665 Error_1 ("set!: unbound variable:", SCHEME_V->code); 3999 Error_1 ("set!: unbound variable:", SCHEME_V->code);
3666 4000
3667
3668 case OP_BEGIN: /* begin */ 4001 case OP_BEGIN: /* begin */
3669 if (!is_pair (SCHEME_V->code)) 4002 if (!is_pair (SCHEME_V->code))
3670 s_return (SCHEME_V->code); 4003 s_return (SCHEME_V->code);
3671 4004
3672 if (cdr (SCHEME_V->code) != NIL) 4005 if (cdr (SCHEME_V->code) != NIL)
… …
3683 case OP_IF1: /* if */ 4016 case OP_IF1: /* if */
3684 if (is_true (SCHEME_V->value)) 4017 if (is_true (SCHEME_V->value))
3685 SCHEME_V->code = car (SCHEME_V->code); 4018 SCHEME_V->code = car (SCHEME_V->code);
3686 else 4019 else
3687 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */ 4020 SCHEME_V->code = cadr (SCHEME_V->code); /* (if #f 1) ==> () because * car(NIL) = NIL */
4021
3688 s_goto (OP_EVAL); 4022 s_goto (OP_EVAL);
3689 4023
3690 case OP_LET0: /* let */ 4024 case OP_LET0: /* let */
3691 SCHEME_V->args = NIL; 4025 SCHEME_V->args = NIL;
3692 SCHEME_V->value = SCHEME_V->code; 4026 SCHEME_V->value = SCHEME_V->code;
3693 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code); 4027 SCHEME_V->code = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code);
3694 s_goto (OP_LET1); 4028 s_goto (OP_LET1);
3695 4029
3696 case OP_LET1: /* let (calculate parameters) */ 4030 case OP_LET1: /* let (calculate parameters) */
4031 case OP_LET1REC: /* letrec (calculate parameters) */
3697 args = cons (SCHEME_V->value, args); 4032 args = cons (SCHEME_V->value, args);
3698 4033
3699 if (is_pair (SCHEME_V->code)) /* continue */ 4034 if (is_pair (SCHEME_V->code)) /* continue */
3700 { 4035 {
3701 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code))) 4036 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3702 Error_1 ("Bad syntax of binding spec in let :", car (SCHEME_V->code)); 4037 Error_1 ("Bad syntax of binding spec in let/letrec:", car (SCHEME_V->code));
3703 4038
3704 s_save (SCHEME_A_ OP_LET1, args, cdr (SCHEME_V->code)); 4039 s_save (SCHEME_A_ op, args, cdr (SCHEME_V->code));
3705 SCHEME_V->code = cadar (SCHEME_V->code); 4040 SCHEME_V->code = cadar (SCHEME_V->code);
3706 SCHEME_V->args = NIL; 4041 SCHEME_V->args = NIL;
3707 s_goto (OP_EVAL); 4042 s_goto (OP_EVAL);
3708 } 4043 }
3709 else /* end */ 4044
3710 { 4045 /* end */
3711 args = reverse_in_place (SCHEME_A_ NIL, args); 4046 args = reverse_in_place (SCHEME_A_ NIL, args);
3712 SCHEME_V->code = car (args); 4047 SCHEME_V->code = car (args);
3713 SCHEME_V->args = cdr (args); 4048 SCHEME_V->args = cdr (args);
3714 s_goto (OP_LET2); 4049 s_goto (op == OP_LET1 ? OP_LET2 : OP_LET2REC);
3715 }
3716 4050
3717 case OP_LET2: /* let */ 4051 case OP_LET2: /* let */
3718 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4052 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3719 4053
3720 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args; 4054 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
… …
3724 if (is_symbol (car (SCHEME_V->code))) /* named let */ 4058 if (is_symbol (car (SCHEME_V->code))) /* named let */
3725 { 4059 {
3726 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x)) 4060 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3727 { 4061 {
3728 if (!is_pair (x)) 4062 if (!is_pair (x))
3729 Error_1 ("Bad syntax of binding in let :", x); 4063 Error_1 ("Bad syntax of binding in let:", x);
3730 4064
3731 if (!is_list (SCHEME_A_ car (x))) 4065 if (!is_list (SCHEME_A_ car (x)))
3732 Error_1 ("Bad syntax of binding in let :", car (x)); 4066 Error_1 ("Bad syntax of binding in let:", car (x));
3733 4067
3734 args = cons (caar (x), args); 4068 args = cons (caar (x), args);
3735 } 4069 }
3736 4070
3737 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)), 4071 x = mk_closure (SCHEME_A_ cons (reverse_in_place (SCHEME_A_ NIL, args), cddr (SCHEME_V->code)),
… …
3754 SCHEME_V->code = cdr (SCHEME_V->code); 4088 SCHEME_V->code = cdr (SCHEME_V->code);
3755 s_goto (OP_BEGIN); 4089 s_goto (OP_BEGIN);
3756 } 4090 }
3757 4091
3758 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code))) 4092 if (!is_pair (car (SCHEME_V->code)) || !is_pair (caar (SCHEME_V->code)) || !is_pair (cdaar (SCHEME_V->code)))
3759 Error_1 ("Bad syntax of binding spec in let* :", car (SCHEME_V->code)); 4093 Error_1 ("Bad syntax of binding spec in let*:", car (SCHEME_V->code));
3760 4094
3761 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code)); 4095 s_save (SCHEME_A_ OP_LET1AST, cdr (SCHEME_V->code), car (SCHEME_V->code));
3762 SCHEME_V->code = car (cdaar (SCHEME_V->code)); 4096 SCHEME_V->code = car (cdaar (SCHEME_V->code));
3763 s_goto (OP_EVAL); 4097 s_goto (OP_EVAL);
3764 4098
… …
3775 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code); 4109 s_save (SCHEME_A_ OP_LET2AST, args, SCHEME_V->code);
3776 SCHEME_V->code = cadar (SCHEME_V->code); 4110 SCHEME_V->code = cadar (SCHEME_V->code);
3777 SCHEME_V->args = NIL; 4111 SCHEME_V->args = NIL;
3778 s_goto (OP_EVAL); 4112 s_goto (OP_EVAL);
3779 } 4113 }
3780 else /* end */ 4114
4115 /* end */
3781 { 4116
3782 SCHEME_V->code = args; 4117 SCHEME_V->code = args;
3783 SCHEME_V->args = NIL; 4118 SCHEME_V->args = NIL;
3784 s_goto (OP_BEGIN); 4119 s_goto (OP_BEGIN);
3785 }
3786 4120
3787 case OP_LET0REC: /* letrec */ 4121 case OP_LET0REC: /* letrec */
3788 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 4122 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3789 SCHEME_V->args = NIL; 4123 SCHEME_V->args = NIL;
3790 SCHEME_V->value = SCHEME_V->code; 4124 SCHEME_V->value = SCHEME_V->code;
3791 SCHEME_V->code = car (SCHEME_V->code); 4125 SCHEME_V->code = car (SCHEME_V->code);
3792 s_goto (OP_LET1REC); 4126 s_goto (OP_LET1REC);
3793 4127
3794 case OP_LET1REC: /* letrec (calculate parameters) */ 4128 /* OP_LET1REC handled by OP_LET1 */
3795 args = cons (SCHEME_V->value, args);
3796
3797 if (is_pair (SCHEME_V->code)) /* continue */
3798 {
3799 if (!is_pair (car (SCHEME_V->code)) || !is_pair (cdar (SCHEME_V->code)))
3800 Error_1 ("Bad syntax of binding spec in letrec :", car (SCHEME_V->code));
3801
3802 s_save (SCHEME_A_ OP_LET1REC, args, cdr (SCHEME_V->code));
3803 SCHEME_V->code = cadar (SCHEME_V->code);
3804 SCHEME_V->args = NIL;
3805 s_goto (OP_EVAL);
3806 }
3807 else /* end */
3808 {
3809 args = reverse_in_place (SCHEME_A_ NIL, args);
3810 SCHEME_V->code = car (args);
3811 SCHEME_V->args = cdr (args);
3812 s_goto (OP_LET2REC);
3813 }
3814 4129
3815 case OP_LET2REC: /* letrec */ 4130 case OP_LET2REC: /* letrec */
3816 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y)) 4131 for (x = car (SCHEME_V->code), y = args; y != NIL; x = cdr (x), y = cdr (y))
3817 new_slot_in_env (SCHEME_A_ caar (x), car (y)); 4132 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3818 4133
… …
3848 } 4163 }
3849 else 4164 else
3850 { 4165 {
3851 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL) 4166 if ((SCHEME_V->code = cdr (SCHEME_V->code)) == NIL)
3852 s_return (NIL); 4167 s_return (NIL);
3853 else 4168
3854 {
3855 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code); 4169 s_save (SCHEME_A_ OP_COND1, NIL, SCHEME_V->code);
3856 SCHEME_V->code = caar (SCHEME_V->code); 4170 SCHEME_V->code = caar (SCHEME_V->code);
3857 s_goto (OP_EVAL); 4171 s_goto (OP_EVAL);
3858 }
3859 } 4172 }
3860 4173
3861 case OP_DELAY: /* delay */ 4174 case OP_DELAY: /* delay */
3862 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir); 4175 x = mk_closure (SCHEME_A_ cons (NIL, SCHEME_V->code), SCHEME_V->envir);
3863 set_typeflag (x, T_PROMISE); 4176 set_typeflag (x, T_PROMISE);
… …
3874 case OP_AND1: /* and */ 4187 case OP_AND1: /* and */
3875 if (is_false (SCHEME_V->value)) 4188 if (is_false (SCHEME_V->value))
3876 s_return (SCHEME_V->value); 4189 s_return (SCHEME_V->value);
3877 else if (SCHEME_V->code == NIL) 4190 else if (SCHEME_V->code == NIL)
3878 s_return (SCHEME_V->value); 4191 s_return (SCHEME_V->value);
3879 else 4192
3880 {
3881 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code)); 4193 s_save (SCHEME_A_ OP_AND1, NIL, cdr (SCHEME_V->code));
3882 SCHEME_V->code = car (SCHEME_V->code); 4194 SCHEME_V->code = car (SCHEME_V->code);
3883 s_goto (OP_EVAL); 4195 s_goto (OP_EVAL);
3884 }
3885 4196
3886 case OP_OR0: /* or */ 4197 case OP_OR0: /* or */
3887 if (SCHEME_V->code == NIL) 4198 if (SCHEME_V->code == NIL)
3888 s_return (S_F); 4199 s_return (S_F);
3889 4200
… …
3894 case OP_OR1: /* or */ 4205 case OP_OR1: /* or */
3895 if (is_true (SCHEME_V->value)) 4206 if (is_true (SCHEME_V->value))
3896 s_return (SCHEME_V->value); 4207 s_return (SCHEME_V->value);
3897 else if (SCHEME_V->code == NIL) 4208 else if (SCHEME_V->code == NIL)
3898 s_return (SCHEME_V->value); 4209 s_return (SCHEME_V->value);
3899 else 4210
3900 {
3901 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code)); 4211 s_save (SCHEME_A_ OP_OR1, NIL, cdr (SCHEME_V->code));
3902 SCHEME_V->code = car (SCHEME_V->code); 4212 SCHEME_V->code = car (SCHEME_V->code);
3903 s_goto (OP_EVAL); 4213 s_goto (OP_EVAL);
3904 }
3905 4214
3906 case OP_C0STREAM: /* cons-stream */ 4215 case OP_C0STREAM: /* cons-stream */
3907 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code)); 4216 s_save (SCHEME_A_ OP_C1STREAM, NIL, cdr (SCHEME_V->code));
3908 SCHEME_V->code = car (SCHEME_V->code); 4217 SCHEME_V->code = car (SCHEME_V->code);
3909 s_goto (OP_EVAL); 4218 s_goto (OP_EVAL);
… …
3974 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x)); 4283 s_save (SCHEME_A_ OP_CASE2, NIL, cdar (x));
3975 SCHEME_V->code = caar (x); 4284 SCHEME_V->code = caar (x);
3976 s_goto (OP_EVAL); 4285 s_goto (OP_EVAL);
3977 } 4286 }
3978 } 4287 }
3979 else 4288
3980 s_return (NIL); 4289 s_return (NIL);
3981 4290
3982 case OP_CASE2: /* case */ 4291 case OP_CASE2: /* case */
3983 if (is_true (SCHEME_V->value)) 4292 if (is_true (SCHEME_V->value))
3984 s_goto (OP_BEGIN); 4293 s_goto (OP_BEGIN);
3985 else 4294
3986 s_return (NIL); 4295 s_return (NIL);
3987 4296
3988 case OP_PAPPLY: /* apply */ 4297 case OP_PAPPLY: /* apply */
3989 SCHEME_V->code = car (args); 4298 SCHEME_V->code = car (args);
3990 SCHEME_V->args = list_star (SCHEME_A_ cdr (args)); 4299 SCHEME_V->args = list_star (SCHEME_A_ cdr (args));
3991 /*SCHEME_V->args = cadr(args); */ 4300 /*SCHEME_V->args = cadr(args); */
… …
4005 } 4314 }
4006 4315
4007 if (USE_ERROR_CHECKING) abort (); 4316 if (USE_ERROR_CHECKING) abort ();
4008} 4317}
4009 4318
4010static int 4319/* math, cxr */
4320ecb_hot static int
4011opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4321opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4012{ 4322{
4013 pointer args = SCHEME_V->args; 4323 pointer args = SCHEME_V->args;
4014 pointer x = car (args); 4324 pointer x = car (args);
4015 num v; 4325 num v;
4016 4326
4017 switch (op) 4327 switch (op)
4018 { 4328 {
4019#if USE_MATH 4329#if USE_MATH
4020 case OP_INEX2EX: /* inexact->exact */ 4330 case OP_INEX2EX: /* inexact->exact */
4021 {
4022 if (is_integer (x)) 4331 if (!is_integer (x))
4023 s_return (x); 4332 {
4024
4025 RVALUE r = rvalue_unchecked (x); 4333 RVALUE r = rvalue_unchecked (x);
4026 4334
4027 if (r == (RVALUE)(IVALUE)r) 4335 if (r == (RVALUE)(IVALUE)r)
4028 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4336 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
4029 else 4337 else
4030 Error_1 ("inexact->exact: not integral:", x); 4338 Error_1 ("inexact->exact: not integral:", x);
4031 } 4339 }
4032 4340
4341 s_return (x);
4342
4343 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4344 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4345 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4346 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4347
4348 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4033 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4349 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4034 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4350 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4351 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
4035 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4352 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4036 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4353 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4037 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4354 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4038 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4355 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4039 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4356 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4040 4357
4041 case OP_ATAN: 4358 case OP_ATAN:
4359 s_return (mk_real (SCHEME_A_
4042 if (cdr (args) == NIL) 4360 cdr (args) == NIL
4043 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4361 ? atan (rvalue (x))
4044 else 4362 : atan2 (rvalue (x), rvalue (cadr (args)))));
4045 {
4046 pointer y = cadr (args);
4047 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4048 }
4049
4050 case OP_SQRT:
4051 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4052 4363
4053 case OP_EXPT: 4364 case OP_EXPT:
4054 { 4365 {
4055 RVALUE result; 4366 RVALUE result;
4056 int real_result = 1; 4367 int real_result = 1;
… …
4079 if (real_result) 4390 if (real_result)
4080 s_return (mk_real (SCHEME_A_ result)); 4391 s_return (mk_real (SCHEME_A_ result));
4081 else 4392 else
4082 s_return (mk_integer (SCHEME_A_ result)); 4393 s_return (mk_integer (SCHEME_A_ result));
4083 } 4394 }
4084
4085 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4086 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4087
4088 case OP_TRUNCATE:
4089 {
4090 RVALUE n = rvalue (x);
4091 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4092 }
4093
4094 case OP_ROUND:
4095 if (is_integer (x))
4096 s_return (x);
4097
4098 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4099#endif 4395#endif
4100 4396
4101 case OP_ADD: /* + */ 4397 case OP_ADD: /* + */
4102 v = num_zero; 4398 v = num_zero;
4103 4399
… …
4191 else 4487 else
4192 Error_0 ("modulo: division by zero"); 4488 Error_0 ("modulo: division by zero");
4193 4489
4194 s_return (mk_number (SCHEME_A_ v)); 4490 s_return (mk_number (SCHEME_A_ v));
4195 4491
4196 case OP_CAR: /* car */ 4492 /* the compiler will optimize this mess... */
4197 s_return (caar (args)); 4493 case OP_CAR: op_car: s_return (car (x));
4198 4494 case OP_CDR: op_cdr: s_return (cdr (x));
4199 case OP_CDR: /* cdr */ 4495 case OP_CAAR: op_caar: x = car (x); goto op_car;
4200 s_return (cdar (args)); 4496 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4497 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4498 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4499 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4500 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4501 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4502 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4503 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4504 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4505 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4506 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4507 case OP_CAAAAR: x = car (x); goto op_caaar;
4508 case OP_CAAADR: x = cdr (x); goto op_caaar;
4509 case OP_CAADAR: x = car (x); goto op_caadr;
4510 case OP_CAADDR: x = cdr (x); goto op_caadr;
4511 case OP_CADAAR: x = car (x); goto op_cadar;
4512 case OP_CADADR: x = cdr (x); goto op_cadar;
4513 case OP_CADDAR: x = car (x); goto op_caddr;
4514 case OP_CADDDR: x = cdr (x); goto op_caddr;
4515 case OP_CDAAAR: x = car (x); goto op_cdaar;
4516 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4517 case OP_CDADAR: x = car (x); goto op_cdadr;
4518 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4519 case OP_CDDAAR: x = car (x); goto op_cddar;
4520 case OP_CDDADR: x = cdr (x); goto op_cddar;
4521 case OP_CDDDAR: x = car (x); goto op_cdddr;
4522 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4201 4523
4202 case OP_CONS: /* cons */ 4524 case OP_CONS: /* cons */
4203 set_cdr (args, cadr (args)); 4525 set_cdr (args, cadr (args));
4204 s_return (args); 4526 s_return (args);
4205 4527
… …
4379 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4701 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4380 4702
4381 s_return (newstr); 4703 s_return (newstr);
4382 } 4704 }
4383 4705
4384 case OP_SUBSTR: /* substring */ 4706 case OP_STRING_COPY: /* substring/string-copy */
4385 { 4707 {
4386 char *str = strvalue (x); 4708 char *str = strvalue (x);
4387 int index0 = ivalue_unchecked (cadr (args)); 4709 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4388 int index1; 4710 int index1;
4389 int len; 4711 int len;
4390 4712
4391 if (index0 > strlength (x)) 4713 if (index0 > strlength (x))
4392 Error_1 ("substring: start out of bounds:", cadr (args)); 4714 Error_1 ("string->copy: start out of bounds:", cadr (args));
4393 4715
4394 if (cddr (args) != NIL) 4716 if (cddr (args) != NIL)
4395 { 4717 {
4396 index1 = ivalue_unchecked (caddr (args)); 4718 index1 = ivalue_unchecked (caddr (args));
4397 4719
4398 if (index1 > strlength (x) || index1 < index0) 4720 if (index1 > strlength (x) || index1 < index0)
4399 Error_1 ("substring: end out of bounds:", caddr (args)); 4721 Error_1 ("string->copy: end out of bounds:", caddr (args));
4400 } 4722 }
4401 else 4723 else
4402 index1 = strlength (x); 4724 index1 = strlength (x);
4403 4725
4404 len = index1 - index0; 4726 len = index1 - index0;
4405 x = mk_empty_string (SCHEME_A_ len, ' '); 4727 x = mk_counted_string (SCHEME_A_ str + index0, len);
4406 memcpy (strvalue (x), str + index0, len);
4407 strvalue (x)[len] = 0;
4408 4728
4409 s_return (x); 4729 s_return (x);
4410 } 4730 }
4411 4731
4412 case OP_VECTOR: /* vector */ 4732 case OP_VECTOR: /* vector */
… …
4486 } 4806 }
4487 4807
4488 if (USE_ERROR_CHECKING) abort (); 4808 if (USE_ERROR_CHECKING) abort ();
4489} 4809}
4490 4810
4491static int 4811/* relational ops */
4812ecb_hot static int
4492opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4813opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4493{ 4814{
4494 pointer x = SCHEME_V->args; 4815 pointer x = SCHEME_V->args;
4495 4816
4496 for (;;) 4817 for (;;)
… …
4517 } 4838 }
4518 4839
4519 s_return (S_T); 4840 s_return (S_T);
4520} 4841}
4521 4842
4522static int 4843/* predicates */
4844ecb_hot static int
4523opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4845opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4524{ 4846{
4525 pointer args = SCHEME_V->args; 4847 pointer args = SCHEME_V->args;
4526 pointer a = car (args); 4848 pointer a = car (args);
4527 pointer d = cdr (args); 4849 pointer d = cdr (args);
4528 int r; 4850 int r;
4529 4851
4530 switch (op) 4852 switch (op)
4531 { 4853 {
4532 case OP_NOT: /* not */ r = is_false (a) ; break; 4854 case OP_NOT: /* not */ r = is_false (a) ; break;
4533 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4855 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4534 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4856 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4535 case OP_NULLP: /* null? */ r = a == NIL ; break; 4857 case OP_NULLP: /* null? */ r = a == NIL ; break;
4536 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4858 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4859 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4537 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4860 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4538 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4861 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4539 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4862 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4540 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4863 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4541 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4864 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4542 4865
4543#if USE_CHAR_CLASSIFIERS 4866#if USE_CHAR_CLASSIFIERS
4544 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4867 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4545 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4868 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4546 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4869 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
… …
4573 } 4896 }
4574 4897
4575 s_retbool (r); 4898 s_retbool (r);
4576} 4899}
4577 4900
4578static int 4901/* promises, list ops, ports */
4902ecb_hot static int
4579opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4903opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4580{ 4904{
4581 pointer args = SCHEME_V->args; 4905 pointer args = SCHEME_V->args;
4582 pointer a = car (args); 4906 pointer a = car (args);
4583 pointer x, y; 4907 pointer x, y;
… …
4596 } 4920 }
4597 else 4921 else
4598 s_return (SCHEME_V->code); 4922 s_return (SCHEME_V->code);
4599 4923
4600 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4924 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4601 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4925 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4602 s_return (SCHEME_V->value); 4926 s_return (SCHEME_V->value);
4603 4927
4604#if USE_PORTS 4928#if USE_PORTS
4929
4930 case OP_EOF_OBJECT: /* eof-object */
4931 s_return (S_EOF);
4605 4932
4606 case OP_WRITE: /* write */ 4933 case OP_WRITE: /* write */
4607 case OP_DISPLAY: /* display */ 4934 case OP_DISPLAY: /* display */
4608 case OP_WRITE_CHAR: /* write-char */ 4935 case OP_WRITE_CHAR: /* write-char */
4609 if (is_pair (cdr (SCHEME_V->args))) 4936 if (is_pair (cdr (SCHEME_V->args)))
… …
4623 else 4950 else
4624 SCHEME_V->print_flag = 0; 4951 SCHEME_V->print_flag = 0;
4625 4952
4626 s_goto (OP_P0LIST); 4953 s_goto (OP_P0LIST);
4627 4954
4955 //TODO: move to scheme
4628 case OP_NEWLINE: /* newline */ 4956 case OP_NEWLINE: /* newline */
4629 if (is_pair (args)) 4957 if (is_pair (args))
4630 { 4958 {
4631 if (a != SCHEME_V->outport) 4959 if (a != SCHEME_V->outport)
4632 { 4960 {
… …
4634 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL); 4962 s_save (SCHEME_A_ OP_SET_OUTPORT, x, NIL);
4635 SCHEME_V->outport = a; 4963 SCHEME_V->outport = a;
4636 } 4964 }
4637 } 4965 }
4638 4966
4639 putstr (SCHEME_A_ "\n"); 4967 putcharacter (SCHEME_A_ '\n');
4640 s_return (S_T); 4968 s_return (S_T);
4641#endif 4969#endif
4642 4970
4643 case OP_ERR0: /* error */ 4971 case OP_ERR0: /* error */
4644 SCHEME_V->retcode = -1; 4972 SCHEME_V->retcode = -1;
… …
4653 putstr (SCHEME_A_ strvalue (car (args))); 4981 putstr (SCHEME_A_ strvalue (car (args)));
4654 SCHEME_V->args = cdr (args); 4982 SCHEME_V->args = cdr (args);
4655 s_goto (OP_ERR1); 4983 s_goto (OP_ERR1);
4656 4984
4657 case OP_ERR1: /* error */ 4985 case OP_ERR1: /* error */
4658 putstr (SCHEME_A_ " "); 4986 putcharacter (SCHEME_A_ ' ');
4659 4987
4660 if (args != NIL) 4988 if (args != NIL)
4661 { 4989 {
4662 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL); 4990 s_save (SCHEME_A_ OP_ERR1, cdr (args), NIL);
4663 SCHEME_V->args = a; 4991 SCHEME_V->args = a;
4664 SCHEME_V->print_flag = 1; 4992 SCHEME_V->print_flag = 1;
4665 s_goto (OP_P0LIST); 4993 s_goto (OP_P0LIST);
4666 } 4994 }
4667 else 4995 else
4668 { 4996 {
4669 putstr (SCHEME_A_ "\n"); 4997 putcharacter (SCHEME_A_ '\n');
4670 4998
4671 if (SCHEME_V->interactive_repl) 4999 if (SCHEME_V->interactive_repl)
4672 s_goto (OP_T0LVL); 5000 s_goto (OP_T0LVL);
4673 else 5001 else
4674 return -1; 5002 return -1;
… …
4751 SCHEME_V->gc_verbose = (a != S_F); 5079 SCHEME_V->gc_verbose = (a != S_F);
4752 s_retbool (was); 5080 s_retbool (was);
4753 } 5081 }
4754 5082
4755 case OP_NEWSEGMENT: /* new-segment */ 5083 case OP_NEWSEGMENT: /* new-segment */
5084#if 0
4756 if (!is_pair (args) || !is_number (a)) 5085 if (!is_pair (args) || !is_number (a))
4757 Error_0 ("new-segment: argument must be a number"); 5086 Error_0 ("new-segment: argument must be a number");
4758 5087#endif
4759 alloc_cellseg (SCHEME_A_ ivalue (a)); 5088 s_retbool (alloc_cellseg (SCHEME_A));
4760
4761 s_return (S_T);
4762 5089
4763 case OP_OBLIST: /* oblist */ 5090 case OP_OBLIST: /* oblist */
4764 s_return (oblist_all_symbols (SCHEME_A)); 5091 s_return (oblist_all_symbols (SCHEME_A));
4765 5092
4766#if USE_PORTS 5093#if USE_PORTS
… …
4836 s_return (p == NIL ? S_F : p); 5163 s_return (p == NIL ? S_F : p);
4837 } 5164 }
4838 5165
4839 case OP_GET_OUTSTRING: /* get-output-string */ 5166 case OP_GET_OUTSTRING: /* get-output-string */
4840 { 5167 {
4841 port *p; 5168 port *p = port (a);
4842 5169
4843 if ((p = a->object.port)->kind & port_string) 5170 if (p->kind & port_string)
4844 { 5171 {
4845 off_t size; 5172 off_t size;
4846 char *str; 5173 char *str;
4847 5174
4848 size = p->rep.string.curr - p->rep.string.start + 1; 5175 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4883 } 5210 }
4884 5211
4885 if (USE_ERROR_CHECKING) abort (); 5212 if (USE_ERROR_CHECKING) abort ();
4886} 5213}
4887 5214
4888static int 5215/* reading */
5216ecb_cold static int
4889opexe_5 (SCHEME_P_ enum scheme_opcodes op) 5217opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4890{ 5218{
4891 pointer args = SCHEME_V->args; 5219 pointer args = SCHEME_V->args;
4892 pointer x; 5220 pointer x;
4893 5221
… …
4953 int res; 5281 int res;
4954 5282
4955 if (is_pair (args)) 5283 if (is_pair (args))
4956 p = car (args); 5284 p = car (args);
4957 5285
4958 res = p->object.port->kind & port_string; 5286 res = port (p)->kind & port_string;
4959 5287
4960 s_retbool (res); 5288 s_retbool (res);
4961 } 5289 }
4962 5290
4963 case OP_SET_INPORT: /* set-input-port */ 5291 case OP_SET_INPORT: /* set-input-port */
… …
4972 case OP_RDSEXPR: 5300 case OP_RDSEXPR:
4973 switch (SCHEME_V->tok) 5301 switch (SCHEME_V->tok)
4974 { 5302 {
4975 case TOK_EOF: 5303 case TOK_EOF:
4976 s_return (S_EOF); 5304 s_return (S_EOF);
4977 /* NOTREACHED */
4978 5305
4979 case TOK_VEC: 5306 case TOK_VEC:
4980 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL); 5307 s_save (SCHEME_A_ OP_RDVEC, NIL, NIL);
4981 /* fall through */ 5308 /* fall through */
4982 5309
… …
4985 5312
4986 if (SCHEME_V->tok == TOK_RPAREN) 5313 if (SCHEME_V->tok == TOK_RPAREN)
4987 s_return (NIL); 5314 s_return (NIL);
4988 else if (SCHEME_V->tok == TOK_DOT) 5315 else if (SCHEME_V->tok == TOK_DOT)
4989 Error_0 ("syntax error: illegal dot expression"); 5316 Error_0 ("syntax error: illegal dot expression");
4990 else 5317
4991 {
4992 SCHEME_V->nesting_stack[SCHEME_V->file_i]++; 5318 SCHEME_V->nesting_stack[SCHEME_V->file_i]++;
4993 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL); 5319 s_save (SCHEME_A_ OP_RDLIST, NIL, NIL);
4994 s_goto (OP_RDSEXPR); 5320 s_goto (OP_RDSEXPR);
4995 }
4996 5321
4997 case TOK_QUOTE: 5322 case TOK_QUOTE:
4998 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL); 5323 s_save (SCHEME_A_ OP_RDQUOTE, NIL, NIL);
4999 SCHEME_V->tok = token (SCHEME_A); 5324 SCHEME_V->tok = token (SCHEME_A);
5000 s_goto (OP_RDSEXPR); 5325 s_goto (OP_RDSEXPR);
… …
5006 { 5331 {
5007 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL); 5332 s_save (SCHEME_A_ OP_RDQQUOTEVEC, NIL, NIL);
5008 SCHEME_V->tok = TOK_LPAREN; 5333 SCHEME_V->tok = TOK_LPAREN;
5009 s_goto (OP_RDSEXPR); 5334 s_goto (OP_RDSEXPR);
5010 } 5335 }
5011 else 5336
5012 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL); 5337 s_save (SCHEME_A_ OP_RDQQUOTE, NIL, NIL);
5013
5014 s_goto (OP_RDSEXPR); 5338 s_goto (OP_RDSEXPR);
5015 5339
5016 case TOK_COMMA: 5340 case TOK_COMMA:
5017 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL); 5341 s_save (SCHEME_A_ OP_RDUNQUOTE, NIL, NIL);
5018 SCHEME_V->tok = token (SCHEME_A); 5342 SCHEME_V->tok = token (SCHEME_A);
… …
5029 case TOK_DOTATOM: 5353 case TOK_DOTATOM:
5030 SCHEME_V->strbuff[0] = '.'; 5354 SCHEME_V->strbuff[0] = '.';
5031 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS))); 5355 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5032 5356
5033 case TOK_STRATOM: 5357 case TOK_STRATOM:
5358 //TODO: haven't checked whether the garbage collector could interfere and free x
5359 gc (SCHEME_A_ NIL, NIL); //TODO: superheavyhanded
5034 x = readstrexp (SCHEME_A_ '|'); 5360 x = readstrexp (SCHEME_A_ '|');
5035 //TODO: haven't checked whether the garbage collector could interfere
5036 s_return (mk_atom (SCHEME_A_ strvalue (x))); 5361 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5037 5362
5038 case TOK_DQUOTE: 5363 case TOK_DQUOTE:
5039 x = readstrexp (SCHEME_A_ '"'); 5364 x = readstrexp (SCHEME_A_ '"');
5040 5365
… …
5048 { 5373 {
5049 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1); 5374 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->SHARP_HOOK, 1);
5050 5375
5051 if (f == NIL) 5376 if (f == NIL)
5052 Error_0 ("undefined sharp expression"); 5377 Error_0 ("undefined sharp expression");
5053 else 5378
5054 {
5055 SCHEME_V->code = cons (slot_value_in_env (f), NIL); 5379 SCHEME_V->code = cons (slot_value_in_env (f), NIL);
5056 s_goto (OP_EVAL); 5380 s_goto (OP_EVAL);
5057 }
5058 } 5381 }
5059 5382
5060 case TOK_SHARP_CONST: 5383 case TOK_SHARP_CONST:
5061 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL) 5384 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5062 Error_0 ("undefined sharp expression"); 5385 Error_0 ("undefined sharp expression");
5063 else 5386
5064 s_return (x); 5387 s_return (x);
5065 5388
5066 default: 5389 default:
5067 Error_0 ("syntax error: illegal token"); 5390 Error_0 ("syntax error: illegal token");
5068 } 5391 }
5069 5392
… …
5162 pointer b = cdr (args); 5485 pointer b = cdr (args);
5163 int ok_abbr = ok_abbrev (b); 5486 int ok_abbr = ok_abbrev (b);
5164 SCHEME_V->args = car (b); 5487 SCHEME_V->args = car (b);
5165 5488
5166 if (a == SCHEME_V->QUOTE && ok_abbr) 5489 if (a == SCHEME_V->QUOTE && ok_abbr)
5167 putstr (SCHEME_A_ "'"); 5490 putcharacter (SCHEME_A_ '\'');
5168 else if (a == SCHEME_V->QQUOTE && ok_abbr) 5491 else if (a == SCHEME_V->QQUOTE && ok_abbr)
5169 putstr (SCHEME_A_ "`"); 5492 putcharacter (SCHEME_A_ '`');
5170 else if (a == SCHEME_V->UNQUOTE && ok_abbr) 5493 else if (a == SCHEME_V->UNQUOTE && ok_abbr)
5171 putstr (SCHEME_A_ ","); 5494 putcharacter (SCHEME_A_ ',');
5172 else if (a == SCHEME_V->UNQUOTESP && ok_abbr) 5495 else if (a == SCHEME_V->UNQUOTESP && ok_abbr)
5173 putstr (SCHEME_A_ ",@"); 5496 putstr (SCHEME_A_ ",@");
5174 else 5497 else
5175 { 5498 {
5176 putstr (SCHEME_A_ "("); 5499 putcharacter (SCHEME_A_ '(');
5177 s_save (SCHEME_A_ OP_P1LIST, b, NIL); 5500 s_save (SCHEME_A_ OP_P1LIST, b, NIL);
5178 SCHEME_V->args = a; 5501 SCHEME_V->args = a;
5179 } 5502 }
5180 5503
5181 s_goto (OP_P0LIST); 5504 s_goto (OP_P0LIST);
… …
5183 5506
5184 case OP_P1LIST: 5507 case OP_P1LIST:
5185 if (is_pair (args)) 5508 if (is_pair (args))
5186 { 5509 {
5187 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL); 5510 s_save (SCHEME_A_ OP_P1LIST, cdr (args), NIL);
5188 putstr (SCHEME_A_ " "); 5511 putcharacter (SCHEME_A_ ' ');
5189 SCHEME_V->args = car (args); 5512 SCHEME_V->args = car (args);
5190 s_goto (OP_P0LIST); 5513 s_goto (OP_P0LIST);
5191 } 5514 }
5192 else if (is_vector (args)) 5515 else if (is_vector (args))
5193 { 5516 {
… …
5201 { 5524 {
5202 putstr (SCHEME_A_ " . "); 5525 putstr (SCHEME_A_ " . ");
5203 printatom (SCHEME_A_ args, SCHEME_V->print_flag); 5526 printatom (SCHEME_A_ args, SCHEME_V->print_flag);
5204 } 5527 }
5205 5528
5206 putstr (SCHEME_A_ ")"); 5529 putcharacter (SCHEME_A_ ')');
5207 s_return (S_T); 5530 s_return (S_T);
5208 } 5531 }
5209 5532
5210 case OP_PVECFROM: 5533 case OP_PVECFROM:
5211 { 5534 {
… …
5213 pointer vec = car (args); 5536 pointer vec = car (args);
5214 int len = veclength (vec); 5537 int len = veclength (vec);
5215 5538
5216 if (i == len) 5539 if (i == len)
5217 { 5540 {
5218 putstr (SCHEME_A_ ")"); 5541 putcharacter (SCHEME_A_ ')');
5219 s_return (S_T); 5542 s_return (S_T);
5220 } 5543 }
5221 else 5544 else
5222 { 5545 {
5223 pointer elem = vector_get (vec, i); 5546 pointer elem = vector_get (vec, i);
… …
5225 ivalue_unchecked (cdr (args)) = i + 1; 5548 ivalue_unchecked (cdr (args)) = i + 1;
5226 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5549 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5227 SCHEME_V->args = elem; 5550 SCHEME_V->args = elem;
5228 5551
5229 if (i > 0) 5552 if (i > 0)
5230 putstr (SCHEME_A_ " "); 5553 putcharacter (SCHEME_A_ ' ');
5231 5554
5232 s_goto (OP_P0LIST); 5555 s_goto (OP_P0LIST);
5233 } 5556 }
5234 } 5557 }
5235 } 5558 }
5236 5559
5237 if (USE_ERROR_CHECKING) abort (); 5560 if (USE_ERROR_CHECKING) abort ();
5238} 5561}
5239 5562
5240static int 5563/* list ops */
5564ecb_hot static int
5241opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5565opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5242{ 5566{
5243 pointer args = SCHEME_V->args; 5567 pointer args = SCHEME_V->args;
5244 pointer a = car (args); 5568 pointer a = car (args);
5245 pointer x, y; 5569 pointer x, y;
… …
5268 break; 5592 break;
5269 } 5593 }
5270 5594
5271 if (is_pair (y)) 5595 if (is_pair (y))
5272 s_return (car (y)); 5596 s_return (car (y));
5273 else 5597
5274 s_return (S_F); 5598 s_return (S_F);
5275
5276 5599
5277 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */ 5600 case OP_GET_CLOSURE: /* get-closure-code *//* a.k */
5278 SCHEME_V->args = a; 5601 SCHEME_V->args = a;
5279 5602
5280 if (SCHEME_V->args == NIL) 5603 if (SCHEME_V->args == NIL)
5281 s_return (S_F); 5604 s_return (S_F);
5282 else if (is_closure (SCHEME_V->args)) 5605 else if (is_closure (SCHEME_V->args) || is_macro (SCHEME_V->args))
5283 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value))); 5606 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5284 else if (is_macro (SCHEME_V->args)) 5607
5285 s_return (cons (SCHEME_V->LAMBDA, closure_code (SCHEME_V->value)));
5286 else
5287 s_return (S_F); 5608 s_return (S_F);
5288 5609
5289 case OP_CLOSUREP: /* closure? */ 5610 case OP_CLOSUREP: /* closure? */
5290 /* 5611 /*
5291 * Note, macro object is also a closure. 5612 * Note, macro object is also a closure.
5292 * Therefore, (closure? <#MACRO>) ==> #t 5613 * Therefore, (closure? <#MACRO>) ==> #t
… …
5303 5624
5304/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5625/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5305typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5626typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5306 5627
5307typedef int (*test_predicate)(pointer); 5628typedef int (*test_predicate)(pointer);
5308static int 5629
5630ecb_hot static int
5309tst_any (pointer p) 5631tst_any (pointer p)
5310{ 5632{
5311 return 1; 5633 return 1;
5312} 5634}
5313 5635
5314static int 5636ecb_hot static int
5315tst_inonneg (pointer p) 5637tst_inonneg (pointer p)
5316{ 5638{
5317 return is_integer (p) && ivalue_unchecked (p) >= 0; 5639 return is_integer (p) && ivalue_unchecked (p) >= 0;
5318} 5640}
5319 5641
5320static int 5642ecb_hot static int
5321tst_is_list (SCHEME_P_ pointer p) 5643tst_is_list (SCHEME_P_ pointer p)
5322{ 5644{
5323 return p == NIL || is_pair (p); 5645 return p == NIL || is_pair (p);
5324} 5646}
5325 5647
… …
5368#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5690#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5369#include "opdefines.h" 5691#include "opdefines.h"
5370#undef OP_DEF 5692#undef OP_DEF
5371; 5693;
5372 5694
5373static const char * 5695ecb_cold static const char *
5374opname (int idx) 5696opname (int idx)
5375{ 5697{
5376 const char *name = opnames; 5698 const char *name = opnames;
5377 5699
5378 /* should do this at compile time, but would require external program, right? */ 5700 /* should do this at compile time, but would require external program, right? */
… …
5380 name += strlen (name) + 1; 5702 name += strlen (name) + 1;
5381 5703
5382 return *name ? name : "ILLEGAL"; 5704 return *name ? name : "ILLEGAL";
5383} 5705}
5384 5706
5385static const char * 5707ecb_cold static const char *
5386procname (pointer x) 5708procname (pointer x)
5387{ 5709{
5388 return opname (procnum (x)); 5710 return opname (procnum (x));
5389} 5711}
5390 5712
… …
5410#undef OP_DEF 5732#undef OP_DEF
5411 {0} 5733 {0}
5412}; 5734};
5413 5735
5414/* kernel of this interpreter */ 5736/* kernel of this interpreter */
5415static void ecb_hot 5737ecb_hot static void
5416Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5738Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5417{ 5739{
5418 SCHEME_V->op = op; 5740 SCHEME_V->op = op;
5419 5741
5420 for (;;) 5742 for (;;)
… …
5503 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5825 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5504 return; 5826 return;
5505 5827
5506 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5828 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5507 { 5829 {
5508 xwrstr ("No memory!\n"); 5830 putstr (SCHEME_A_ "No memory!\n");
5509 return; 5831 return;
5510 } 5832 }
5511 } 5833 }
5512} 5834}
5513 5835
5514/* ========== Initialization of internal keywords ========== */ 5836/* ========== Initialization of internal keywords ========== */
5515 5837
5516static void 5838ecb_cold static void
5517assign_syntax (SCHEME_P_ const char *name) 5839assign_syntax (SCHEME_P_ const char *name)
5518{ 5840{
5519 pointer x = oblist_add_by_name (SCHEME_A_ name); 5841 pointer x = oblist_add_by_name (SCHEME_A_ name);
5520 set_typeflag (x, typeflag (x) | T_SYNTAX); 5842 set_typeflag (x, typeflag (x) | T_SYNTAX);
5521} 5843}
5522 5844
5523static void 5845ecb_cold static void
5524assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5846assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5525{ 5847{
5526 pointer x = mk_symbol (SCHEME_A_ name); 5848 pointer x = mk_symbol (SCHEME_A_ name);
5527 pointer y = mk_proc (SCHEME_A_ op); 5849 pointer y = mk_proc (SCHEME_A_ op);
5528 new_slot_in_env (SCHEME_A_ x, y); 5850 new_slot_in_env (SCHEME_A_ x, y);
… …
5536 ivalue_unchecked (y) = op; 5858 ivalue_unchecked (y) = op;
5537 return y; 5859 return y;
5538} 5860}
5539 5861
5540/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5862/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5541static int 5863ecb_hot static int
5542syntaxnum (pointer p) 5864syntaxnum (pointer p)
5543{ 5865{
5544 const char *s = strvalue (p); 5866 const char *s = strvalue (p);
5545 5867
5546 switch (strlength (p)) 5868 switch (strlength (p))
… …
5626ecb_cold int 5948ecb_cold int
5627scheme_init (SCHEME_P) 5949scheme_init (SCHEME_P)
5628{ 5950{
5629 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5951 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5630 pointer x; 5952 pointer x;
5953
5954 /* this memset is not strictly correct, as we assume (intcache)
5955 * that memset 0 will also set pointers to 0, but memset does
5956 * of course not guarantee that. screw such systems.
5957 */
5958 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5631 5959
5632 num_set_fixnum (num_zero, 1); 5960 num_set_fixnum (num_zero, 1);
5633 num_set_ivalue (num_zero, 0); 5961 num_set_ivalue (num_zero, 0);
5634 num_set_fixnum (num_one, 1); 5962 num_set_fixnum (num_one, 1);
5635 num_set_ivalue (num_one, 1); 5963 num_set_ivalue (num_one, 1);
… …
5647 SCHEME_V->save_inport = NIL; 5975 SCHEME_V->save_inport = NIL;
5648 SCHEME_V->loadport = NIL; 5976 SCHEME_V->loadport = NIL;
5649 SCHEME_V->nesting = 0; 5977 SCHEME_V->nesting = 0;
5650 SCHEME_V->interactive_repl = 0; 5978 SCHEME_V->interactive_repl = 0;
5651 5979
5652 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5980 if (!alloc_cellseg (SCHEME_A))
5653 { 5981 {
5654#if USE_ERROR_CHECKING 5982#if USE_ERROR_CHECKING
5655 SCHEME_V->no_memory = 1; 5983 SCHEME_V->no_memory = 1;
5656 return 0; 5984 return 0;
5657#endif 5985#endif
5658 } 5986 }
5659 5987
5660 SCHEME_V->gc_verbose = 0; 5988 SCHEME_V->gc_verbose = 0;
5661 dump_stack_initialize (SCHEME_A); 5989 dump_stack_initialize (SCHEME_A);
5662 SCHEME_V->code = NIL; 5990 SCHEME_V->code = NIL;
5663 SCHEME_V->args = NIL; 5991 SCHEME_V->args = NIL;
5664 SCHEME_V->envir = NIL; 5992 SCHEME_V->envir = NIL;
5993 SCHEME_V->value = NIL;
5665 SCHEME_V->tracing = 0; 5994 SCHEME_V->tracing = 0;
5666 5995
5667 /* init NIL */ 5996 /* init NIL */
5668 set_typeflag (NIL, T_ATOM | T_MARK); 5997 set_typeflag (NIL, T_ATOM | T_MARK);
5669 set_car (NIL, NIL); 5998 set_car (NIL, NIL);
… …
5725 6054
5726 return !SCHEME_V->no_memory; 6055 return !SCHEME_V->no_memory;
5727} 6056}
5728 6057
5729#if USE_PORTS 6058#if USE_PORTS
5730void 6059ecb_cold void
5731scheme_set_input_port_file (SCHEME_P_ int fin) 6060scheme_set_input_port_file (SCHEME_P_ int fin)
5732{ 6061{
5733 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 6062 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5734} 6063}
5735 6064
5736void 6065ecb_cold void
5737scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 6066scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5738{ 6067{
5739 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 6068 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5740} 6069}
5741 6070
5742void 6071ecb_cold void
5743scheme_set_output_port_file (SCHEME_P_ int fout) 6072scheme_set_output_port_file (SCHEME_P_ int fout)
5744{ 6073{
5745 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 6074 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5746} 6075}
5747 6076
5748void 6077ecb_cold void
5749scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 6078scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5750{ 6079{
5751 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 6080 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5752} 6081}
5753#endif 6082#endif
5754 6083
5755void 6084ecb_cold void
5756scheme_set_external_data (SCHEME_P_ void *p) 6085scheme_set_external_data (SCHEME_P_ void *p)
5757{ 6086{
5758 SCHEME_V->ext_data = p; 6087 SCHEME_V->ext_data = p;
5759} 6088}
5760 6089
… …
5792 SCHEME_V->loadport = NIL; 6121 SCHEME_V->loadport = NIL;
5793 SCHEME_V->gc_verbose = 0; 6122 SCHEME_V->gc_verbose = 0;
5794 gc (SCHEME_A_ NIL, NIL); 6123 gc (SCHEME_A_ NIL, NIL);
5795 6124
5796 for (i = 0; i <= SCHEME_V->last_cell_seg; i++) 6125 for (i = 0; i <= SCHEME_V->last_cell_seg; i++)
5797 free (SCHEME_V->alloc_seg[i]); 6126 free (SCHEME_V->cell_seg[i]);
5798 6127
5799#if SHOW_ERROR_LINE 6128#if SHOW_ERROR_LINE
5800 for (i = 0; i <= SCHEME_V->file_i; i++) 6129 for (i = 0; i <= SCHEME_V->file_i; i++)
5801 {
5802 if (SCHEME_V->load_stack[i].kind & port_file) 6130 if (SCHEME_V->load_stack[i].kind & port_file)
5803 { 6131 {
5804 fname = SCHEME_V->load_stack[i].rep.stdio.filename; 6132 fname = SCHEME_V->load_stack[i].rep.stdio.filename;
5805 6133
5806 if (fname) 6134 if (fname)
5807 free (fname); 6135 free (fname);
5808 } 6136 }
5809 }
5810#endif 6137#endif
5811} 6138}
5812 6139
5813void 6140ecb_cold void
5814scheme_load_file (SCHEME_P_ int fin) 6141scheme_load_file (SCHEME_P_ int fin)
5815{ 6142{
5816 scheme_load_named_file (SCHEME_A_ fin, 0); 6143 scheme_load_named_file (SCHEME_A_ fin, 0);
5817} 6144}
5818 6145
5819void 6146ecb_cold void
5820scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 6147scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5821{ 6148{
5822 dump_stack_reset (SCHEME_A); 6149 dump_stack_reset (SCHEME_A);
5823 SCHEME_V->envir = SCHEME_V->global_env; 6150 SCHEME_V->envir = SCHEME_V->global_env;
5824 SCHEME_V->file_i = 0; 6151 SCHEME_V->file_i = 0;
5825 SCHEME_V->load_stack[0].unget = -1; 6152 SCHEME_V->load_stack[0].unget = -1;
5826 SCHEME_V->load_stack[0].kind = port_input | port_file; 6153 SCHEME_V->load_stack[0].kind = port_input | port_file;
5827 SCHEME_V->load_stack[0].rep.stdio.file = fin; 6154 SCHEME_V->load_stack[0].rep.stdio.file = fin;
5828#if USE_PORTS
5829 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6155 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5830#endif
5831 SCHEME_V->retcode = 0; 6156 SCHEME_V->retcode = 0;
5832 6157
5833#if USE_PORTS
5834 if (fin == STDIN_FILENO) 6158 if (fin == STDIN_FILENO)
5835 SCHEME_V->interactive_repl = 1; 6159 SCHEME_V->interactive_repl = 1;
5836#endif
5837 6160
5838#if USE_PORTS 6161#if USE_PORTS
5839#if SHOW_ERROR_LINE 6162#if SHOW_ERROR_LINE
5840 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0; 6163 SCHEME_V->load_stack[0].rep.stdio.curr_line = 0;
5841 6164
… …
5845#endif 6168#endif
5846 6169
5847 SCHEME_V->inport = SCHEME_V->loadport; 6170 SCHEME_V->inport = SCHEME_V->loadport;
5848 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6171 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5849 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6172 Eval_Cycle (SCHEME_A_ OP_T0LVL);
6173
5850 set_typeflag (SCHEME_V->loadport, T_ATOM); 6174 set_typeflag (SCHEME_V->loadport, T_ATOM);
5851 6175
5852 if (SCHEME_V->retcode == 0) 6176 if (SCHEME_V->retcode == 0)
5853 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6177 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5854} 6178}
5855 6179
5856void 6180ecb_cold void
5857scheme_load_string (SCHEME_P_ const char *cmd) 6181scheme_load_string (SCHEME_P_ const char *cmd)
5858{ 6182{
6183#if USE_PORTs
5859 dump_stack_reset (SCHEME_A); 6184 dump_stack_reset (SCHEME_A);
5860 SCHEME_V->envir = SCHEME_V->global_env; 6185 SCHEME_V->envir = SCHEME_V->global_env;
5861 SCHEME_V->file_i = 0; 6186 SCHEME_V->file_i = 0;
5862 SCHEME_V->load_stack[0].kind = port_input | port_string; 6187 SCHEME_V->load_stack[0].kind = port_input | port_string;
5863 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */ 6188 SCHEME_V->load_stack[0].rep.string.start = (char *)cmd; /* This func respects const */
5864 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd); 6189 SCHEME_V->load_stack[0].rep.string.past_the_end = (char *)cmd + strlen (cmd);
5865 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd; 6190 SCHEME_V->load_stack[0].rep.string.curr = (char *)cmd;
5866#if USE_PORTS
5867 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack); 6191 SCHEME_V->loadport = mk_port (SCHEME_A_ SCHEME_V->load_stack);
5868#endif
5869 SCHEME_V->retcode = 0; 6192 SCHEME_V->retcode = 0;
5870 SCHEME_V->interactive_repl = 0; 6193 SCHEME_V->interactive_repl = 0;
5871 SCHEME_V->inport = SCHEME_V->loadport; 6194 SCHEME_V->inport = SCHEME_V->loadport;
5872 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i); 6195 SCHEME_V->args = mk_integer (SCHEME_A_ SCHEME_V->file_i);
5873 Eval_Cycle (SCHEME_A_ OP_T0LVL); 6196 Eval_Cycle (SCHEME_A_ OP_T0LVL);
5874 set_typeflag (SCHEME_V->loadport, T_ATOM); 6197 set_typeflag (SCHEME_V->loadport, T_ATOM);
5875 6198
5876 if (SCHEME_V->retcode == 0) 6199 if (SCHEME_V->retcode == 0)
5877 SCHEME_V->retcode = SCHEME_V->nesting != 0; 6200 SCHEME_V->retcode = SCHEME_V->nesting != 0;
6201#else
6202 abort ();
6203#endif
5878} 6204}
5879 6205
5880void 6206ecb_cold void
5881scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 6207scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5882{ 6208{
5883 pointer x; 6209 pointer x;
5884 6210
5885 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 6211 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5890 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 6216 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5891} 6217}
5892 6218
5893#if !STANDALONE 6219#if !STANDALONE
5894 6220
5895void 6221ecb_cold void
5896scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 6222scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5897{ 6223{
5898 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 6224 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5899} 6225}
5900 6226
5901void 6227ecb_cold void
5902scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 6228scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5903{ 6229{
5904 int i; 6230 int i;
5905 6231
5906 for (i = 0; i < count; i++) 6232 for (i = 0; i < count; i++)
5907 scheme_register_foreign_func (SCHEME_A_ list + i); 6233 scheme_register_foreign_func (SCHEME_A_ list + i);
5908} 6234}
5909 6235
5910pointer 6236ecb_cold pointer
5911scheme_apply0 (SCHEME_P_ const char *procname) 6237scheme_apply0 (SCHEME_P_ const char *procname)
5912{ 6238{
5913 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 6239 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5914} 6240}
5915 6241
5916void 6242ecb_cold void
5917save_from_C_call (SCHEME_P) 6243save_from_C_call (SCHEME_P)
5918{ 6244{
5919 pointer saved_data = cons (car (S_SINK), 6245 pointer saved_data = cons (car (S_SINK),
5920 cons (SCHEME_V->envir, 6246 cons (SCHEME_V->envir,
5921 SCHEME_V->dump)); 6247 SCHEME_V->dump));
… …
5925 /* Truncate the dump stack so TS will return here when done, not 6251 /* Truncate the dump stack so TS will return here when done, not
5926 directly resume pre-C-call operations. */ 6252 directly resume pre-C-call operations. */
5927 dump_stack_reset (SCHEME_A); 6253 dump_stack_reset (SCHEME_A);
5928} 6254}
5929 6255
5930void 6256ecb_cold void
5931restore_from_C_call (SCHEME_P) 6257restore_from_C_call (SCHEME_P)
5932{ 6258{
5933 set_car (S_SINK, caar (SCHEME_V->c_nest)); 6259 set_car (S_SINK, caar (SCHEME_V->c_nest));
5934 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 6260 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5935 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 6261 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5936 /* Pop */ 6262 /* Pop */
5937 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 6263 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5938} 6264}
5939 6265
5940/* "func" and "args" are assumed to be already eval'ed. */ 6266/* "func" and "args" are assumed to be already eval'ed. */
5941pointer 6267ecb_cold pointer
5942scheme_call (SCHEME_P_ pointer func, pointer args) 6268scheme_call (SCHEME_P_ pointer func, pointer args)
5943{ 6269{
5944 int old_repl = SCHEME_V->interactive_repl; 6270 int old_repl = SCHEME_V->interactive_repl;
5945 6271
5946 SCHEME_V->interactive_repl = 0; 6272 SCHEME_V->interactive_repl = 0;
… …
5953 SCHEME_V->interactive_repl = old_repl; 6279 SCHEME_V->interactive_repl = old_repl;
5954 restore_from_C_call (SCHEME_A); 6280 restore_from_C_call (SCHEME_A);
5955 return SCHEME_V->value; 6281 return SCHEME_V->value;
5956} 6282}
5957 6283
5958pointer 6284ecb_cold pointer
5959scheme_eval (SCHEME_P_ pointer obj) 6285scheme_eval (SCHEME_P_ pointer obj)
5960{ 6286{
5961 int old_repl = SCHEME_V->interactive_repl; 6287 int old_repl = SCHEME_V->interactive_repl;
5962 6288
5963 SCHEME_V->interactive_repl = 0; 6289 SCHEME_V->interactive_repl = 0;
… …
5975 6301
5976/* ========== Main ========== */ 6302/* ========== Main ========== */
5977 6303
5978#if STANDALONE 6304#if STANDALONE
5979 6305
5980int 6306ecb_cold int
5981main (int argc, char **argv) 6307main (int argc, char **argv)
5982{ 6308{
5983# if USE_MULTIPLICITY 6309# if USE_MULTIPLICITY
5984 scheme ssc; 6310 scheme ssc;
5985 scheme *const SCHEME_V = &ssc; 6311 scheme *const SCHEME_V = &ssc;
… …
5987# endif 6313# endif
5988 int fin; 6314 int fin;
5989 char *file_name = InitFile; 6315 char *file_name = InitFile;
5990 int retcode; 6316 int retcode;
5991 int isfile = 1; 6317 int isfile = 1;
6318#if EXPERIMENT
5992 system ("ps v $PPID");//D 6319 system ("ps v $PPID");
6320#endif
5993 6321
5994 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6322 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5995 { 6323 {
5996 xwrstr ("Usage: tinyscheme -?\n"); 6324 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5997 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6325 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5998 xwrstr ("followed by\n"); 6326 putstr (SCHEME_A_ "followed by\n");
5999 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6327 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6000 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6328 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6001 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6329 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6002 xwrstr ("Use - as filename for stdin.\n"); 6330 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6003 return 1; 6331 return 1;
6004 } 6332 }
6005 6333
6006 if (!scheme_init (SCHEME_A)) 6334 if (!scheme_init (SCHEME_A))
6007 { 6335 {
6008 xwrstr ("Could not initialize!\n"); 6336 putstr (SCHEME_A_ "Could not initialize!\n");
6009 return 2; 6337 return 2;
6010 } 6338 }
6011 6339
6012# if USE_PORTS 6340# if USE_PORTS
6013 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6341 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6026 } 6354 }
6027#endif 6355#endif
6028 6356
6029 do 6357 do
6030 { 6358 {
6031#if USE_PORTS
6032 if (strcmp (file_name, "-") == 0) 6359 if (strcmp (file_name, "-") == 0)
6033 fin = STDIN_FILENO; 6360 fin = STDIN_FILENO;
6034 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0) 6361 else if (strcmp (file_name, "-1") == 0 || strcmp (file_name, "-c") == 0)
6035 { 6362 {
6036 pointer args = NIL; 6363 pointer args = NIL;
… …
6054 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args); 6381 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ "*args*"), args);
6055 6382
6056 } 6383 }
6057 else 6384 else
6058 fin = open (file_name, O_RDONLY); 6385 fin = open (file_name, O_RDONLY);
6059#endif
6060 6386
6061 if (isfile && fin < 0) 6387 if (isfile && fin < 0)
6062 { 6388 {
6063 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6389 putstr (SCHEME_A_ "Could not open file ");
6390 putstr (SCHEME_A_ file_name);
6391 putcharacter (SCHEME_A_ '\n');
6064 } 6392 }
6065 else 6393 else
6066 { 6394 {
6067 if (isfile) 6395 if (isfile)
6068 scheme_load_named_file (SCHEME_A_ fin, file_name); 6396 scheme_load_named_file (SCHEME_A_ fin, file_name);
6069 else 6397 else
6070 scheme_load_string (SCHEME_A_ file_name); 6398 scheme_load_string (SCHEME_A_ file_name);
6071 6399
6072#if USE_PORTS
6073 if (!isfile || fin != STDIN_FILENO) 6400 if (!isfile || fin != STDIN_FILENO)
6074 { 6401 {
6075 if (SCHEME_V->retcode != 0) 6402 if (SCHEME_V->retcode != 0)
6076 { 6403 {
6077 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6404 putstr (SCHEME_A_ "Errors encountered reading ");
6405 putstr (SCHEME_A_ file_name);
6406 putcharacter (SCHEME_A_ '\n');
6078 } 6407 }
6079 6408
6080 if (isfile) 6409 if (isfile)
6081 close (fin); 6410 close (fin);
6082 } 6411 }
6083#endif
6084 } 6412 }
6085 6413
6086 file_name = *argv++; 6414 file_name = *argv++;
6087 } 6415 }
6088 while (file_name != 0); 6416 while (file_name != 0);

Diff Legend

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