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.38 by root, Sun Nov 29 13:47:15 2015 UTC vs.
Revision 1.60 by root, Wed Dec 2 02:59:36 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 EXPERIMENT 1
22
23#if 1
21#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 24#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
22#include "malloc.c" 25#include "malloc.c"
26#endif
23 27
24#define SCHEME_SOURCE 28#define SCHEME_SOURCE
25#include "scheme-private.h" 29#include "scheme-private.h"
26#ifndef WIN32 30#ifndef WIN32
27# include <unistd.h> 31# include <unistd.h>
… …
74 TOK_SHARP_CONST, 78 TOK_SHARP_CONST,
75 TOK_VEC 79 TOK_VEC
76}; 80};
77 81
78#define BACKQUOTE '`' 82#define BACKQUOTE '`'
79#define DELIMITERS "()\";\f\t\v\n\r " 83#define WHITESPACE " \t\r\n\v\f"
84#define DELIMITERS "()\";" WHITESPACE
80 85
81#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 86#define NIL POINTER (&SCHEME_V->xNIL)
82#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 87#define S_T POINTER (&SCHEME_V->xT)
83#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 88#define S_F POINTER (&SCHEME_V->xF)
84#define S_SINK (&SCHEME_V->xsink) 89#define S_SINK POINTER (&SCHEME_V->xsink)
85#define S_EOF (&SCHEME_V->xEOF_OBJ) 90#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
86 91
87#if !USE_MULTIPLICITY 92#if !USE_MULTIPLICITY
88static scheme sc; 93static scheme sc;
89#endif 94#endif
90 95
91static void 96ecb_cold static void
92xbase (char *s, long n, int base) 97xbase (char *s, long n, int base)
93{ 98{
94 if (n < 0) 99 if (n < 0)
95 { 100 {
96 *s++ = '-'; 101 *s++ = '-';
… …
98 } 103 }
99 104
100 char *p = s; 105 char *p = s;
101 106
102 do { 107 do {
103 *p++ = '0' + n % base; 108 *p++ = "0123456789abcdef"[n % base];
104 n /= base; 109 n /= base;
105 } while (n); 110 } while (n);
106 111
107 *p-- = 0; 112 *p-- = 0;
108 113
… …
111 char x = *s; *s = *p; *p = x; 116 char x = *s; *s = *p; *p = x;
112 --p; ++s; 117 --p; ++s;
113 } 118 }
114} 119}
115 120
116static void 121ecb_cold static void
117xnum (char *s, long n) 122xnum (char *s, long n)
118{ 123{
119 xbase (s, n, 10); 124 xbase (s, n, 10);
120} 125}
121 126
122static void 127ecb_cold static void
123xwrstr (const char *s) 128putnum (SCHEME_P_ long n)
124{
125 write (1, s, strlen (s));
126}
127
128static void
129xwrnum (long n)
130{ 129{
131 char buf[64]; 130 char buf[64];
132 131
133 xnum (buf, n); 132 xnum (buf, n);
134 xwrstr (buf); 133 putstr (SCHEME_A_ buf);
135} 134}
136 135
137static char 136ecb_cold static char
138xtoupper (char c) 137xtoupper (char c)
139{ 138{
140 if (c >= 'a' && c <= 'z') 139 if (c >= 'a' && c <= 'z')
141 c -= 'a' - 'A'; 140 c -= 'a' - 'A';
142 141
143 return c; 142 return c;
144} 143}
145 144
146static char 145ecb_cold static char
147xtolower (char c) 146xtolower (char c)
148{ 147{
149 if (c >= 'A' && c <= 'Z') 148 if (c >= 'A' && c <= 'Z')
150 c += 'a' - 'A'; 149 c += 'a' - 'A';
151 150
152 return c; 151 return c;
153} 152}
154 153
155static int 154ecb_cold static int
156xisdigit (char c) 155xisdigit (char c)
157{ 156{
158 return c >= '0' && c <= '9'; 157 return c >= '0' && c <= '9';
159} 158}
160 159
161#define toupper(c) xtoupper (c) 160#define toupper(c) xtoupper (c)
162#define tolower(c) xtolower (c) 161#define tolower(c) xtolower (c)
163#define isdigit(c) xisdigit (c) 162#define isdigit(c) xisdigit (c)
164 163
165#if USE_IGNORECASE 164#if USE_IGNORECASE
166static const char * 165ecb_cold static const char *
167xstrlwr (char *s) 166xstrlwr (char *s)
168{ 167{
169 const char *p = s; 168 const char *p = s;
170 169
171 while (*s) 170 while (*s)
… …
191 190
192#ifndef InitFile 191#ifndef InitFile
193# define InitFile "init.scm" 192# define InitFile "init.scm"
194#endif 193#endif
195 194
196#ifndef FIRST_CELLSEGS
197# define FIRST_CELLSEGS 3
198#endif
199
200enum scheme_types 195enum scheme_types
201{ 196{
202 T_INTEGER, 197 T_INTEGER,
198 T_CHARACTER,
203 T_REAL, 199 T_REAL,
204 T_STRING, 200 T_STRING,
205 T_SYMBOL, 201 T_SYMBOL,
206 T_PROC, 202 T_PROC,
207 T_PAIR, /* also used for free cells */ 203 T_PAIR, /* also used for free cells */
208 T_CLOSURE, 204 T_CLOSURE,
205 T_MACRO,
209 T_CONTINUATION, 206 T_CONTINUATION,
210 T_FOREIGN, 207 T_FOREIGN,
211 T_CHARACTER,
212 T_PORT, 208 T_PORT,
213 T_VECTOR, 209 T_VECTOR,
214 T_MACRO,
215 T_PROMISE, 210 T_PROMISE,
216 T_ENVIRONMENT, 211 T_ENVIRONMENT,
217 /* one more... */ 212 /* one more... */
218 T_NUM_SYSTEM_TYPES 213 T_NUM_SYSTEM_TYPES
219}; 214};
… …
255static num num_op (enum num_op op, num a, num b); 250static num num_op (enum num_op op, num a, num b);
256static num num_intdiv (num a, num b); 251static num num_intdiv (num a, num b);
257static num num_rem (num a, num b); 252static num num_rem (num a, num b);
258static num num_mod (num a, num b); 253static num num_mod (num a, num b);
259 254
260#if USE_MATH
261static double round_per_R5RS (double x);
262#endif
263static int is_zero_rvalue (RVALUE x); 255static int is_zero_rvalue (RVALUE x);
264 256
265static num num_zero; 257static num num_zero;
266static num num_one; 258static num num_one;
267 259
260/* convert "pointer" to cell* / cell* to pointer */
261#define CELL(p) ((struct cell *)(p) + 0)
262#define POINTER(c) ((void *)((c) - 0))
263
268/* macros for cell operations */ 264/* macros for cell operations */
269#define typeflag(p) ((p)->flag + 0) 265#define typeflag(p) (CELL(p)->flag + 0)
270#define set_typeflag(p,v) ((p)->flag = (v)) 266#define set_typeflag(p,v) (CELL(p)->flag = (v))
271#define type(p) (typeflag (p) & T_MASKTYPE) 267#define type(p) (typeflag (p) & T_MASKTYPE)
272 268
273INTERFACE int 269INTERFACE int
274is_string (pointer p) 270is_string (pointer p)
275{ 271{
276 return type (p) == T_STRING; 272 return type (p) == T_STRING;
277} 273}
278 274
279#define strvalue(p) ((p)->object.string.svalue) 275#define strvalue(p) (CELL(p)->object.string.svalue)
280#define strlength(p) ((p)->object.string.length) 276#define strlength(p) (CELL(p)->object.string.length)
281 277
282INTERFACE int 278INTERFACE int
283is_vector (pointer p) 279is_vector (pointer p)
284{ 280{
285 return type (p) == T_VECTOR; 281 return type (p) == T_VECTOR;
286} 282}
287 283
288#define vecvalue(p) ((p)->object.vector.vvalue) 284#define vecvalue(p) (CELL(p)->object.vector.vvalue)
289#define veclength(p) ((p)->object.vector.length) 285#define veclength(p) (CELL(p)->object.vector.length)
290INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj); 286INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
291INTERFACE pointer vector_get (pointer vec, uint32_t ielem); 287INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
292INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a); 288INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
293 289
294INTERFACE int 290INTERFACE int
… …
320string_value (pointer p) 316string_value (pointer p)
321{ 317{
322 return strvalue (p); 318 return strvalue (p);
323} 319}
324 320
325#define ivalue_unchecked(p) (p)->object.ivalue 321#define ivalue_unchecked(p) CELL(p)->object.ivalue
326#define set_ivalue(p,v) (p)->object.ivalue = (v) 322#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
327 323
328#if USE_REAL 324#if USE_REAL
329#define rvalue_unchecked(p) (p)->object.rvalue 325#define rvalue_unchecked(p) CELL(p)->object.rvalue
330#define set_rvalue(p,v) (p)->object.rvalue = (v) 326#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
331#else 327#else
332#define rvalue_unchecked(p) (p)->object.ivalue 328#define rvalue_unchecked(p) CELL(p)->object.ivalue
333#define set_rvalue(p,v) (p)->object.ivalue = (v) 329#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
334#endif 330#endif
335 331
336INTERFACE long 332INTERFACE long
337charvalue (pointer p) 333charvalue (pointer p)
338{ 334{
339 return ivalue_unchecked (p); 335 return ivalue_unchecked (p);
340} 336}
341 337
338#define port(p) CELL(p)->object.port
339#define set_port(p,v) port(p) = (v)
342INTERFACE int 340INTERFACE int
343is_port (pointer p) 341is_port (pointer p)
344{ 342{
345 return type (p) == T_PORT; 343 return type (p) == T_PORT;
346} 344}
347 345
348INTERFACE int 346INTERFACE int
349is_inport (pointer p) 347is_inport (pointer p)
350{ 348{
351 return is_port (p) && p->object.port->kind & port_input; 349 return is_port (p) && port (p)->kind & port_input;
352} 350}
353 351
354INTERFACE int 352INTERFACE int
355is_outport (pointer p) 353is_outport (pointer p)
356{ 354{
357 return is_port (p) && p->object.port->kind & port_output; 355 return is_port (p) && port (p)->kind & port_output;
358} 356}
359 357
360INTERFACE int 358INTERFACE int
361is_pair (pointer p) 359is_pair (pointer p)
362{ 360{
363 return type (p) == T_PAIR; 361 return type (p) == T_PAIR;
364} 362}
365 363
366#define car(p) ((p)->object.cons.car + 0) 364#define car(p) (POINTER (CELL(p)->object.cons.car))
367#define cdr(p) ((p)->object.cons.cdr + 0) 365#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
368 366
369static pointer caar (pointer p) { return car (car (p)); } 367static pointer caar (pointer p) { return car (car (p)); }
370static pointer cadr (pointer p) { return car (cdr (p)); } 368static pointer cadr (pointer p) { return car (cdr (p)); }
371static pointer cdar (pointer p) { return cdr (car (p)); } 369static pointer cdar (pointer p) { return cdr (car (p)); }
372static pointer cddr (pointer p) { return cdr (cdr (p)); } 370static pointer cddr (pointer p) { return cdr (cdr (p)); }
… …
376static pointer cdaar (pointer p) { return cdr (car (car (p))); } 374static pointer cdaar (pointer p) { return cdr (car (car (p))); }
377 375
378INTERFACE void 376INTERFACE void
379set_car (pointer p, pointer q) 377set_car (pointer p, pointer q)
380{ 378{
381 p->object.cons.car = q; 379 CELL(p)->object.cons.car = CELL (q);
382} 380}
383 381
384INTERFACE void 382INTERFACE void
385set_cdr (pointer p, pointer q) 383set_cdr (pointer p, pointer q)
386{ 384{
387 p->object.cons.cdr = q; 385 CELL(p)->object.cons.cdr = CELL (q);
388} 386}
389 387
390INTERFACE pointer 388INTERFACE pointer
391pair_car (pointer p) 389pair_car (pointer p)
392{ 390{
… …
410{ 408{
411 return strvalue (p); 409 return strvalue (p);
412} 410}
413 411
414#if USE_PLIST 412#if USE_PLIST
413#error plists are broken because symbols are no longer pairs
414#define symprop(p) cdr(p)
415SCHEME_EXPORT int 415SCHEME_EXPORT int
416hasprop (pointer p) 416hasprop (pointer p)
417{ 417{
418 return typeflag (p) & T_SYMBOL; 418 return typeflag (p) & T_SYMBOL;
419} 419}
420
421# define symprop(p) cdr(p)
422#endif 420#endif
423 421
424INTERFACE int 422INTERFACE int
425is_syntax (pointer p) 423is_syntax (pointer p)
426{ 424{
… …
522 proper list: length 520 proper list: length
523 circular list: -1 521 circular list: -1
524 not even a pair: -2 522 not even a pair: -2
525 dotted list: -2 minus length before dot 523 dotted list: -2 minus length before dot
526*/ 524*/
527INTERFACE int 525ecb_hot INTERFACE int
528list_length (SCHEME_P_ pointer a) 526list_length (SCHEME_P_ pointer a)
529{ 527{
530 int i = 0; 528 int i = 0;
531 pointer slow, fast; 529 pointer slow, fast;
532 530
… …
638 "gs", 636 "gs",
639 "rs", 637 "rs",
640 "us" 638 "us"
641}; 639};
642 640
643static int 641ecb_cold static int
644is_ascii_name (const char *name, int *pc) 642is_ascii_name (const char *name, int *pc)
645{ 643{
646 int i; 644 int i;
647 645
648 for (i = 0; i < 32; i++) 646 for (i = 0; i < 32; i++)
… …
667 665
668static int file_push (SCHEME_P_ const char *fname); 666static int file_push (SCHEME_P_ const char *fname);
669static void file_pop (SCHEME_P); 667static void file_pop (SCHEME_P);
670static int file_interactive (SCHEME_P); 668static int file_interactive (SCHEME_P);
671ecb_inline int is_one_of (const char *s, int c); 669ecb_inline int is_one_of (const char *s, int c);
672static int alloc_cellseg (SCHEME_P_ int n); 670static int alloc_cellseg (SCHEME_P);
673ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 671ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
674static void finalize_cell (SCHEME_P_ pointer a); 672static void finalize_cell (SCHEME_P_ pointer a);
675static int count_consecutive_cells (pointer x, int needed); 673static int count_consecutive_cells (pointer x, int needed);
676static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all); 674static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
677static pointer mk_number (SCHEME_P_ const num n); 675static pointer mk_number (SCHEME_P_ const num n);
… …
871 } 869 }
872 870
873 return ret; 871 return ret;
874} 872}
875 873
876#if USE_MATH
877
878/* Round to nearest. Round to even if midway */
879static double
880round_per_R5RS (double x)
881{
882 double fl = floor (x);
883 double ce = ceil (x);
884 double dfl = x - fl;
885 double dce = ce - x;
886
887 if (dfl > dce)
888 return ce;
889 else if (dfl < dce)
890 return fl;
891 else
892 {
893 if (fmod (fl, 2) == 0) /* I imagine this holds */
894 return fl;
895 else
896 return ce;
897 }
898}
899#endif
900
901static int 874static int
902is_zero_rvalue (RVALUE x) 875is_zero_rvalue (RVALUE x)
903{ 876{
904 return x == 0; 877 return x == 0;
905#if 0 878#if 0
… …
910#endif 883#endif
911#endif 884#endif
912} 885}
913 886
914/* allocate new cell segment */ 887/* allocate new cell segment */
915static int 888ecb_cold static int
916alloc_cellseg (SCHEME_P_ int n) 889alloc_cellseg (SCHEME_P)
917{ 890{
918 pointer newp; 891 struct cell *newp;
919 pointer last; 892 struct cell *last;
920 pointer p; 893 struct cell *p;
921 char *cp; 894 char *cp;
922 long i; 895 long i;
923 int k; 896 int k;
924 897
925 static int segsize = CELL_SEGSIZE >> 1; 898 static int segsize = CELL_SEGSIZE >> 1;
926 segsize <<= 1; 899 segsize <<= 1;
927 900
928 for (k = 0; k < n; k++)
929 {
930 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
931 return k;
932
933 cp = malloc (segsize * sizeof (struct cell)); 901 cp = malloc (segsize * sizeof (struct cell));
934 902
935 if (!cp && USE_ERROR_CHECKING) 903 if (!cp && USE_ERROR_CHECKING)
936 return k; 904 return k;
937 905
938 i = ++SCHEME_V->last_cell_seg; 906 i = ++SCHEME_V->last_cell_seg;
939 SCHEME_V->alloc_seg[i] = cp; 907 SCHEME_V->alloc_seg[i] = cp;
940 908
941 newp = (pointer)cp; 909 newp = (struct cell *)cp;
942 SCHEME_V->cell_seg[i] = newp; 910 SCHEME_V->cell_seg[i] = newp;
943 SCHEME_V->cell_segsize[i] = segsize; 911 SCHEME_V->cell_segsize[i] = segsize;
944 SCHEME_V->fcells += segsize; 912 SCHEME_V->fcells += segsize;
945 last = newp + segsize - 1; 913 last = newp + segsize - 1;
946 914
947 for (p = newp; p <= last; p++) 915 for (p = newp; p <= last; p++)
948 { 916 {
917 pointer cp = POINTER (p);
949 set_typeflag (p, T_PAIR); 918 set_typeflag (cp, T_PAIR);
950 set_car (p, NIL); 919 set_car (cp, NIL);
951 set_cdr (p, p + 1); 920 set_cdr (cp, POINTER (p + 1));
952 } 921 }
953 922
954 set_cdr (last, SCHEME_V->free_cell); 923 set_cdr (POINTER (last), SCHEME_V->free_cell);
955 SCHEME_V->free_cell = newp; 924 SCHEME_V->free_cell = POINTER (newp);
956 }
957 925
958 return n; 926 return 1;
959} 927}
960 928
961/* get new cell. parameter a, b is marked by gc. */ 929/* get new cell. parameter a, b is marked by gc. */
962ecb_inline pointer 930ecb_inline pointer
963get_cell_x (SCHEME_P_ pointer a, pointer b) 931get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
967 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 935 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
968 return S_SINK; 936 return S_SINK;
969 937
970 if (SCHEME_V->free_cell == NIL) 938 if (SCHEME_V->free_cell == NIL)
971 { 939 {
972 const int min_to_be_recovered = SCHEME_V->last_cell_seg < 128 ? 128 * 8 : SCHEME_V->last_cell_seg * 8; 940 const int min_to_be_recovered = SCHEME_V->cell_segsize [SCHEME_V->last_cell_seg] >> 1;
973 941
974 gc (SCHEME_A_ a, b); 942 gc (SCHEME_A_ a, b);
975 943
976 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL) 944 if (SCHEME_V->fcells < min_to_be_recovered || SCHEME_V->free_cell == NIL)
977 { 945 {
978 /* if only a few recovered, get more to avoid fruitless gc's */ 946 /* if only a few recovered, get more to avoid fruitless gc's */
979 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 947 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
980 { 948 {
981#if USE_ERROR_CHECKING 949#if USE_ERROR_CHECKING
982 SCHEME_V->no_memory = 1; 950 SCHEME_V->no_memory = 1;
983 return S_SINK; 951 return S_SINK;
984#endif 952#endif
… …
996 } 964 }
997} 965}
998 966
999/* To retain recent allocs before interpreter knows about them - 967/* To retain recent allocs before interpreter knows about them -
1000 Tehom */ 968 Tehom */
1001 969ecb_hot static void
1002static void
1003push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 970push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1004{ 971{
1005 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 972 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1006 973
1007 set_typeflag (holder, T_PAIR); 974 set_typeflag (holder, T_PAIR);
… …
1009 set_car (holder, recent); 976 set_car (holder, recent);
1010 set_cdr (holder, car (S_SINK)); 977 set_cdr (holder, car (S_SINK));
1011 set_car (S_SINK, holder); 978 set_car (S_SINK, holder);
1012} 979}
1013 980
1014static pointer 981ecb_hot static pointer
1015get_cell (SCHEME_P_ pointer a, pointer b) 982get_cell (SCHEME_P_ pointer a, pointer b)
1016{ 983{
1017 pointer cell = get_cell_x (SCHEME_A_ a, b); 984 pointer cell = get_cell_x (SCHEME_A_ a, b);
1018 985
1019 /* For right now, include "a" and "b" in "cell" so that gc doesn't 986 /* For right now, include "a" and "b" in "cell" so that gc doesn't
… …
1028} 995}
1029 996
1030static pointer 997static pointer
1031get_vector_object (SCHEME_P_ uint32_t len, pointer init) 998get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1032{ 999{
1033 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1000 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1034 pointer *e = malloc (len * sizeof (pointer)); 1001 pointer *e = malloc (len * sizeof (pointer));
1035 1002
1036 if (!e && USE_ERROR_CHECKING) 1003 if (!e && USE_ERROR_CHECKING)
1037 return S_SINK; 1004 return S_SINK;
1038 1005
1039 /* Record it as a vector so that gc understands it. */ 1006 /* Record it as a vector so that gc understands it. */
1040 set_typeflag (v, T_VECTOR | T_ATOM); 1007 set_typeflag (v, T_VECTOR | T_ATOM);
1041 1008
1042 v->object.vector.vvalue = e; 1009 CELL(v)->object.vector.vvalue = e;
1043 v->object.vector.length = len; 1010 CELL(v)->object.vector.length = len;
1044 fill_vector (v, 0, init); 1011 fill_vector (v, 0, init);
1045 push_recent_alloc (SCHEME_A_ v, NIL); 1012 push_recent_alloc (SCHEME_A_ v, NIL);
1046 1013
1047 return v; 1014 return v;
1048} 1015}
… …
1057static void 1024static void
1058check_cell_alloced (pointer p, int expect_alloced) 1025check_cell_alloced (pointer p, int expect_alloced)
1059{ 1026{
1060 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */ 1027 /* Can't use putstr(SCHEME_A_ str) because callers have no access to sc. */
1061 if (typeflag (p) & !expect_alloced) 1028 if (typeflag (p) & !expect_alloced)
1062 xwrstr ("Cell is already allocated!\n"); 1029 putstr (SCHEME_A_ "Cell is already allocated!\n");
1063 1030
1064 if (!(typeflag (p)) & expect_alloced) 1031 if (!(typeflag (p)) & expect_alloced)
1065 xwrstr ("Cell is not allocated!\n"); 1032 putstr (SCHEME_A_ "Cell is not allocated!\n");
1066} 1033}
1067 1034
1068static void 1035static void
1069check_range_alloced (pointer p, int n, int expect_alloced) 1036check_range_alloced (pointer p, int n, int expect_alloced)
1070{ 1037{
… …
1076#endif 1043#endif
1077 1044
1078/* Medium level cell allocation */ 1045/* Medium level cell allocation */
1079 1046
1080/* get new cons cell */ 1047/* get new cons cell */
1081pointer 1048ecb_hot pointer
1082xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1049xcons (SCHEME_P_ pointer a, pointer b, int immutable)
1083{ 1050{
1084 pointer x = get_cell (SCHEME_A_ a, b); 1051 pointer x = get_cell (SCHEME_A_ a, b);
1085 1052
1086 set_typeflag (x, T_PAIR); 1053 set_typeflag (x, T_PAIR);
… …
1092 set_cdr (x, b); 1059 set_cdr (x, b);
1093 1060
1094 return x; 1061 return x;
1095} 1062}
1096 1063
1097/* ========== oblist implementation ========== */
1098
1099static pointer 1064ecb_cold static pointer
1100generate_symbol (SCHEME_P_ const char *name) 1065generate_symbol (SCHEME_P_ const char *name)
1101{ 1066{
1102 pointer x = mk_string (SCHEME_A_ name); 1067 pointer x = mk_string (SCHEME_A_ name);
1103 setimmutable (x); 1068 setimmutable (x);
1104 set_typeflag (x, T_SYMBOL | T_ATOM); 1069 set_typeflag (x, T_SYMBOL | T_ATOM);
1105 return x; 1070 return x;
1106} 1071}
1107 1072
1073/* ========== oblist implementation ========== */
1074
1108#ifndef USE_OBJECT_LIST 1075#ifndef USE_OBJECT_LIST
1109 1076
1110static int 1077static int
1111hash_fn (const char *key, int table_size) 1078hash_fn (const char *key, int table_size)
1112{ 1079{
… …
1117 hash = (hash ^ *p++) * 16777619; 1084 hash = (hash ^ *p++) * 16777619;
1118 1085
1119 return hash % table_size; 1086 return hash % table_size;
1120} 1087}
1121 1088
1122static pointer 1089ecb_cold static pointer
1123oblist_initial_value (SCHEME_P) 1090oblist_initial_value (SCHEME_P)
1124{ 1091{
1125 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1092 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1126} 1093}
1127 1094
1128/* returns the new symbol */ 1095/* returns the new symbol */
1129static pointer 1096ecb_cold static pointer
1130oblist_add_by_name (SCHEME_P_ const char *name) 1097oblist_add_by_name (SCHEME_P_ const char *name)
1131{ 1098{
1132 pointer x = generate_symbol (SCHEME_A_ name); 1099 pointer x = generate_symbol (SCHEME_A_ name);
1133 int location = hash_fn (name, veclength (SCHEME_V->oblist)); 1100 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1134 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location))); 1101 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1135 return x; 1102 return x;
1136} 1103}
1137 1104
1138ecb_inline pointer 1105ecb_cold static pointer
1139oblist_find_by_name (SCHEME_P_ const char *name) 1106oblist_find_by_name (SCHEME_P_ const char *name)
1140{ 1107{
1141 int location; 1108 int location;
1142 pointer x; 1109 pointer x;
1143 char *s; 1110 char *s;
… …
1154 } 1121 }
1155 1122
1156 return NIL; 1123 return NIL;
1157} 1124}
1158 1125
1159static pointer 1126ecb_cold static pointer
1160oblist_all_symbols (SCHEME_P) 1127oblist_all_symbols (SCHEME_P)
1161{ 1128{
1162 int i; 1129 int i;
1163 pointer x; 1130 pointer x;
1164 pointer ob_list = NIL; 1131 pointer ob_list = NIL;
… …
1170 return ob_list; 1137 return ob_list;
1171} 1138}
1172 1139
1173#else 1140#else
1174 1141
1175static pointer 1142ecb_cold static pointer
1176oblist_initial_value (SCHEME_P) 1143oblist_initial_value (SCHEME_P)
1177{ 1144{
1178 return NIL; 1145 return NIL;
1179} 1146}
1180 1147
1181ecb_inline pointer 1148ecb_cold static pointer
1182oblist_find_by_name (SCHEME_P_ const char *name) 1149oblist_find_by_name (SCHEME_P_ const char *name)
1183{ 1150{
1184 pointer x; 1151 pointer x;
1185 char *s; 1152 char *s;
1186 1153
… …
1195 1162
1196 return NIL; 1163 return NIL;
1197} 1164}
1198 1165
1199/* returns the new symbol */ 1166/* returns the new symbol */
1200static pointer 1167ecb_cold static pointer
1201oblist_add_by_name (SCHEME_P_ const char *name) 1168oblist_add_by_name (SCHEME_P_ const char *name)
1202{ 1169{
1203 pointer x = mk_string (SCHEME_A_ name); 1170 pointer x = generate_symbol (SCHEME_A_ name);
1204 set_typeflag (x, T_SYMBOL);
1205 setimmutable (x);
1206 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1171 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1207 return x; 1172 return x;
1208} 1173}
1209 1174
1210static pointer 1175ecb_cold static pointer
1211oblist_all_symbols (SCHEME_P) 1176oblist_all_symbols (SCHEME_P)
1212{ 1177{
1213 return SCHEME_V->oblist; 1178 return SCHEME_V->oblist;
1214} 1179}
1215 1180
1216#endif 1181#endif
1217 1182
1218#if USE_PORTS 1183#if USE_PORTS
1219static pointer 1184ecb_cold static pointer
1220mk_port (SCHEME_P_ port *p) 1185mk_port (SCHEME_P_ port *p)
1221{ 1186{
1222 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1187 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1223 1188
1224 set_typeflag (x, T_PORT | T_ATOM); 1189 set_typeflag (x, T_PORT | T_ATOM);
1225 x->object.port = p; 1190 set_port (x, p);
1226 1191
1227 return x; 1192 return x;
1228} 1193}
1229#endif 1194#endif
1230 1195
1231pointer 1196ecb_cold pointer
1232mk_foreign_func (SCHEME_P_ foreign_func f) 1197mk_foreign_func (SCHEME_P_ foreign_func f)
1233{ 1198{
1234 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1199 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1235 1200
1236 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1201 set_typeflag (x, T_FOREIGN | T_ATOM);
1237 x->object.ff = f; 1202 CELL(x)->object.ff = f;
1238 1203
1239 return x; 1204 return x;
1240} 1205}
1241 1206
1242INTERFACE pointer 1207INTERFACE pointer
1243mk_character (SCHEME_P_ int c) 1208mk_character (SCHEME_P_ int c)
1244{ 1209{
1245 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1210 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1246 1211
1247 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1212 set_typeflag (x, T_CHARACTER | T_ATOM);
1248 set_ivalue (x, c & 0xff); 1213 set_ivalue (x, c & 0xff);
1249 1214
1250 return x; 1215 return x;
1251} 1216}
1252 1217
1253/* get number atom (integer) */ 1218/* get number atom (integer) */
1254INTERFACE pointer 1219INTERFACE pointer
1255mk_integer (SCHEME_P_ long n) 1220mk_integer (SCHEME_P_ long n)
1256{ 1221{
1222 pointer p = 0;
1223 pointer *pp = &p;
1224
1225#if USE_INTCACHE
1226 if (n >= INTCACHE_MIN && n <= INTCACHE_MAX)
1227 pp = &SCHEME_V->intcache[n - INTCACHE_MIN];
1228#endif
1229
1230 if (!*pp)
1231 {
1257 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1232 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1258 1233
1259 set_typeflag (x, (T_INTEGER | T_ATOM)); 1234 set_typeflag (x, T_INTEGER | T_ATOM);
1235 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1260 set_ivalue (x, n); 1236 set_ivalue (x, n);
1261 1237
1238 *pp = x;
1239 }
1240
1262 return x; 1241 return *pp;
1263} 1242}
1264 1243
1265INTERFACE pointer 1244INTERFACE pointer
1266mk_real (SCHEME_P_ RVALUE n) 1245mk_real (SCHEME_P_ RVALUE n)
1267{ 1246{
1268#if USE_REAL 1247#if USE_REAL
1269 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1248 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1270 1249
1271 set_typeflag (x, (T_REAL | T_ATOM)); 1250 set_typeflag (x, T_REAL | T_ATOM);
1272 set_rvalue (x, n); 1251 set_rvalue (x, n);
1273 1252
1274 return x; 1253 return x;
1275#else 1254#else
1276 return mk_integer (SCHEME_A_ n); 1255 return mk_integer (SCHEME_A_ n);
… …
1387 x = oblist_add_by_name (SCHEME_A_ name); 1366 x = oblist_add_by_name (SCHEME_A_ name);
1388 1367
1389 return x; 1368 return x;
1390} 1369}
1391 1370
1392INTERFACE pointer 1371ecb_cold INTERFACE pointer
1393gensym (SCHEME_P) 1372gensym (SCHEME_P)
1394{ 1373{
1395 pointer x; 1374 pointer x;
1396 char name[40] = "gensym-"; 1375 char name[40] = "gensym-";
1397 xnum (name + 7, SCHEME_V->gensym_cnt); 1376 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1398 1377
1399 return generate_symbol (SCHEME_A_ name); 1378 return generate_symbol (SCHEME_A_ name);
1400} 1379}
1401 1380
1381static int
1382is_gensym (SCHEME_P_ pointer x)
1383{
1384 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1385}
1386
1402/* make symbol or number atom from string */ 1387/* make symbol or number atom from string */
1403static pointer 1388ecb_cold static pointer
1404mk_atom (SCHEME_P_ char *q) 1389mk_atom (SCHEME_P_ char *q)
1405{ 1390{
1406 char c, *p; 1391 char c, *p;
1407 int has_dec_point = 0; 1392 int has_dec_point = 0;
1408 int has_fp_exp = 0; 1393 int has_fp_exp = 0;
… …
1479 1464
1480 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1465 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1481} 1466}
1482 1467
1483/* make constant */ 1468/* make constant */
1484static pointer 1469ecb_cold static pointer
1485mk_sharp_const (SCHEME_P_ char *name) 1470mk_sharp_const (SCHEME_P_ char *name)
1486{ 1471{
1487 if (!strcmp (name, "t")) 1472 if (!strcmp (name, "t"))
1488 return S_T; 1473 return S_T;
1489 else if (!strcmp (name, "f")) 1474 else if (!strcmp (name, "f"))
1490 return S_F; 1475 return S_F;
1491 else if (*name == '\\') /* #\w (character) */ 1476 else if (*name == '\\') /* #\w (character) */
1492 { 1477 {
1493 int c; 1478 int c;
1494 1479
1480 // TODO: optimise
1495 if (stricmp (name + 1, "space") == 0) 1481 if (stricmp (name + 1, "space") == 0)
1496 c = ' '; 1482 c = ' ';
1497 else if (stricmp (name + 1, "newline") == 0) 1483 else if (stricmp (name + 1, "newline") == 0)
1498 c = '\n'; 1484 c = '\n';
1499 else if (stricmp (name + 1, "return") == 0) 1485 else if (stricmp (name + 1, "return") == 0)
1500 c = '\r'; 1486 c = '\r';
1501 else if (stricmp (name + 1, "tab") == 0) 1487 else if (stricmp (name + 1, "tab") == 0)
1502 c = '\t'; 1488 c = '\t';
1489 else if (stricmp (name + 1, "alarm") == 0)
1490 c = 0x07;
1491 else if (stricmp (name + 1, "backspace") == 0)
1492 c = 0x08;
1493 else if (stricmp (name + 1, "escape") == 0)
1494 c = 0x1b;
1495 else if (stricmp (name + 1, "delete") == 0)
1496 c = 0x7f;
1497 else if (stricmp (name + 1, "null") == 0)
1498 c = 0;
1503 else if (name[1] == 'x' && name[2] != 0) 1499 else if (name[1] == 'x' && name[2] != 0)
1504 { 1500 {
1505 long c1 = strtol (name + 2, 0, 16); 1501 long c1 = strtol (name + 2, 0, 16);
1506 1502
1507 if (0 <= c1 && c1 <= UCHAR_MAX) 1503 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1532 return NIL; 1528 return NIL;
1533 } 1529 }
1534} 1530}
1535 1531
1536/* ========== garbage collector ========== */ 1532/* ========== garbage collector ========== */
1533
1534static void
1535finalize_cell (SCHEME_P_ pointer a)
1536{
1537 /* TODO, fast bitmap check? */
1538 if (is_string (a) || is_symbol (a))
1539 free (strvalue (a));
1540 else if (is_vector (a))
1541 free (vecvalue (a));
1542#if USE_PORTS
1543 else if (is_port (a))
1544 {
1545 if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1546 port_close (SCHEME_A_ a, port_input | port_output);
1547
1548 free (port (a));
1549 }
1550#endif
1551}
1537 1552
1538/*-- 1553/*--
1539 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1, 1554 * We use algorithm E (Knuth, The Art of Computer Programming Vol.1,
1540 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1555 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1541 * for marking. 1556 * for marking.
1542 * 1557 *
1543 * The exception is vectors - vectors are currently marked recursively, 1558 * The exception is vectors - vectors are currently marked recursively,
1544 * which is inherited form tinyscheme and could be fixed by having another 1559 * which is inherited form tinyscheme and could be fixed by having another
1545 * word of context in the vector 1560 * word of context in the vector
1546 */ 1561 */
1547static void 1562ecb_hot static void
1548mark (pointer a) 1563mark (pointer a)
1549{ 1564{
1550 pointer t, q, p; 1565 pointer t, q, p;
1551 1566
1552 t = 0; 1567 t = 0;
… …
1609 p = q; 1624 p = q;
1610 goto E6; 1625 goto E6;
1611 } 1626 }
1612} 1627}
1613 1628
1629ecb_hot static void
1630gc_free (SCHEME_P)
1631{
1632 int i;
1633 uint32_t total = 0;
1634
1635 /* Here we scan the cells to build the free-list. */
1636 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1637 {
1638 struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1639 struct cell *p;
1640 total += SCHEME_V->cell_segsize [i];
1641
1642 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1643 {
1644 pointer c = POINTER (p);
1645
1646 if (is_mark (c))
1647 clrmark (c);
1648 else
1649 {
1650 /* reclaim cell */
1651 if (typeflag (c) != T_PAIR)
1652 {
1653 finalize_cell (SCHEME_A_ c);
1654 set_typeflag (c, T_PAIR);
1655 set_car (c, NIL);
1656 }
1657
1658 ++SCHEME_V->fcells;
1659 set_cdr (c, SCHEME_V->free_cell);
1660 SCHEME_V->free_cell = c;
1661 }
1662 }
1663 }
1664
1665 if (SCHEME_V->gc_verbose)
1666 {
1667 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");
1668 }
1669}
1670
1614/* garbage collection. parameter a, b is marked. */ 1671/* garbage collection. parameter a, b is marked. */
1615static void 1672ecb_cold static void
1616gc (SCHEME_P_ pointer a, pointer b) 1673gc (SCHEME_P_ pointer a, pointer b)
1617{ 1674{
1618 pointer p;
1619 int i; 1675 int i;
1620 1676
1621 if (SCHEME_V->gc_verbose) 1677 if (SCHEME_V->gc_verbose)
1622 putstr (SCHEME_A_ "gc..."); 1678 putstr (SCHEME_A_ "gc...");
1623 1679
… …
1639 /* Mark recent objects the interpreter doesn't know about yet. */ 1695 /* Mark recent objects the interpreter doesn't know about yet. */
1640 mark (car (S_SINK)); 1696 mark (car (S_SINK));
1641 /* Mark any older stuff above nested C calls */ 1697 /* Mark any older stuff above nested C calls */
1642 mark (SCHEME_V->c_nest); 1698 mark (SCHEME_V->c_nest);
1643 1699
1700#if USE_INTCACHE
1701 /* mark intcache */
1702 for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
1703 if (SCHEME_V->intcache[i - INTCACHE_MIN])
1704 mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
1705#endif
1706
1644 /* mark variables a, b */ 1707 /* mark variables a, b */
1645 mark (a); 1708 mark (a);
1646 mark (b); 1709 mark (b);
1647 1710
1648 /* garbage collect */ 1711 /* garbage collect */
1649 clrmark (NIL); 1712 clrmark (NIL);
1650 SCHEME_V->fcells = 0; 1713 SCHEME_V->fcells = 0;
1651 SCHEME_V->free_cell = NIL; 1714 SCHEME_V->free_cell = NIL;
1652 1715
1653 /* free-list is kept sorted by address so as to maintain consecutive
1654 ranges, if possible, for use with vectors. Here we scan the cells
1655 (which are also kept sorted by address) downwards to build the
1656 free-list in sorted order.
1657 */
1658 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1659 {
1660 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1661
1662 while (--p >= SCHEME_V->cell_seg[i])
1663 {
1664 if (is_mark (p))
1665 clrmark (p);
1666 else
1667 {
1668 /* reclaim cell */
1669 if (typeflag (p) != T_PAIR)
1670 {
1671 finalize_cell (SCHEME_A_ p);
1672 set_typeflag (p, T_PAIR);
1673 set_car (p, NIL);
1674 }
1675
1676 ++SCHEME_V->fcells;
1677 set_cdr (p, SCHEME_V->free_cell);
1678 SCHEME_V->free_cell = p;
1679 }
1680 }
1681 }
1682
1683 if (SCHEME_V->gc_verbose) 1716 if (SCHEME_V->gc_verbose)
1684 { 1717 putstr (SCHEME_A_ "freeing...");
1685 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n");
1686 }
1687}
1688 1718
1689static void 1719 gc_free (SCHEME_A);
1690finalize_cell (SCHEME_P_ pointer a)
1691{
1692 /* TODO, fast bitmap check? */
1693 if (is_string (a))
1694 free (strvalue (a));
1695 else if (is_vector (a))
1696 free (vecvalue (a));
1697#if USE_PORTS
1698 else if (is_port (a))
1699 {
1700 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1701 port_close (SCHEME_A_ a, port_input | port_output);
1702
1703 free (a->object.port);
1704 }
1705#endif
1706} 1720}
1707 1721
1708/* ========== Routines for Reading ========== */ 1722/* ========== Routines for Reading ========== */
1709 1723
1710static int 1724ecb_cold static int
1711file_push (SCHEME_P_ const char *fname) 1725file_push (SCHEME_P_ const char *fname)
1712{ 1726{
1713#if USE_PORTS 1727#if USE_PORTS
1714 int fin; 1728 int fin;
1715 1729
… …
1724 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1738 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1725 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input; 1739 SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file | port_input;
1726 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin; 1740 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1727 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1; 1741 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1728 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1742 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1729 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1743 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1730 1744
1731#if SHOW_ERROR_LINE 1745#if SHOW_ERROR_LINE
1732 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0; 1746 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1733 1747
1734 if (fname) 1748 if (fname)
… …
1741#else 1755#else
1742 return 1; 1756 return 1;
1743#endif 1757#endif
1744} 1758}
1745 1759
1746static void 1760ecb_cold static void
1747file_pop (SCHEME_P) 1761file_pop (SCHEME_P)
1748{ 1762{
1749 if (SCHEME_V->file_i != 0) 1763 if (SCHEME_V->file_i != 0)
1750 { 1764 {
1751 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1765 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1752#if USE_PORTS 1766#if USE_PORTS
1753 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1767 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1754#endif 1768#endif
1755 SCHEME_V->file_i--; 1769 SCHEME_V->file_i--;
1756 SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i; 1770 set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1757 } 1771 }
1758} 1772}
1759 1773
1760static int 1774ecb_cold static int
1761file_interactive (SCHEME_P) 1775file_interactive (SCHEME_P)
1762{ 1776{
1763#if USE_PORTS 1777#if USE_PORTS
1764 return SCHEME_V->file_i == 0 1778 return SCHEME_V->file_i == 0
1765 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1779 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1766 && (SCHEME_V->inport->object.port->kind & port_file); 1780 && (port (SCHEME_V->inport)->kind & port_file);
1767#else 1781#else
1768 return 0; 1782 return 0;
1769#endif 1783#endif
1770} 1784}
1771 1785
1772#if USE_PORTS 1786#if USE_PORTS
1773static port * 1787ecb_cold static port *
1774port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1788port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1775{ 1789{
1776 int fd; 1790 int fd;
1777 int flags; 1791 int flags;
1778 char *rw; 1792 char *rw;
… …
1801# endif 1815# endif
1802 1816
1803 return pt; 1817 return pt;
1804} 1818}
1805 1819
1806static pointer 1820ecb_cold static pointer
1807port_from_filename (SCHEME_P_ const char *fn, int prop) 1821port_from_filename (SCHEME_P_ const char *fn, int prop)
1808{ 1822{
1809 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1823 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1810 1824
1811 if (!pt && USE_ERROR_CHECKING) 1825 if (!pt && USE_ERROR_CHECKING)
1812 return NIL; 1826 return NIL;
1813 1827
1814 return mk_port (SCHEME_A_ pt); 1828 return mk_port (SCHEME_A_ pt);
1815} 1829}
1816 1830
1817static port * 1831ecb_cold static port *
1818port_rep_from_file (SCHEME_P_ int f, int prop) 1832port_rep_from_file (SCHEME_P_ int f, int prop)
1819{ 1833{
1820 port *pt = malloc (sizeof *pt); 1834 port *pt = malloc (sizeof *pt);
1821 1835
1822 if (!pt && USE_ERROR_CHECKING) 1836 if (!pt && USE_ERROR_CHECKING)
… …
1827 pt->rep.stdio.file = f; 1841 pt->rep.stdio.file = f;
1828 pt->rep.stdio.closeit = 0; 1842 pt->rep.stdio.closeit = 0;
1829 return pt; 1843 return pt;
1830} 1844}
1831 1845
1832static pointer 1846ecb_cold static pointer
1833port_from_file (SCHEME_P_ int f, int prop) 1847port_from_file (SCHEME_P_ int f, int prop)
1834{ 1848{
1835 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1849 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1836 1850
1837 if (!pt && USE_ERROR_CHECKING) 1851 if (!pt && USE_ERROR_CHECKING)
1838 return NIL; 1852 return NIL;
1839 1853
1840 return mk_port (SCHEME_A_ pt); 1854 return mk_port (SCHEME_A_ pt);
1841} 1855}
1842 1856
1843static port * 1857ecb_cold static port *
1844port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1858port_rep_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1845{ 1859{
1846 port *pt = malloc (sizeof (port)); 1860 port *pt = malloc (sizeof (port));
1847 1861
1848 if (!pt && USE_ERROR_CHECKING) 1862 if (!pt && USE_ERROR_CHECKING)
… …
1854 pt->rep.string.curr = start; 1868 pt->rep.string.curr = start;
1855 pt->rep.string.past_the_end = past_the_end; 1869 pt->rep.string.past_the_end = past_the_end;
1856 return pt; 1870 return pt;
1857} 1871}
1858 1872
1859static pointer 1873ecb_cold static pointer
1860port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop) 1874port_from_string (SCHEME_P_ char *start, char *past_the_end, int prop)
1861{ 1875{
1862 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop); 1876 port *pt = port_rep_from_string (SCHEME_A_ start, past_the_end, prop);
1863 1877
1864 if (!pt && USE_ERROR_CHECKING) 1878 if (!pt && USE_ERROR_CHECKING)
… …
1867 return mk_port (SCHEME_A_ pt); 1881 return mk_port (SCHEME_A_ pt);
1868} 1882}
1869 1883
1870# define BLOCK_SIZE 256 1884# define BLOCK_SIZE 256
1871 1885
1872static port * 1886ecb_cold static port *
1873port_rep_from_scratch (SCHEME_P) 1887port_rep_from_scratch (SCHEME_P)
1874{ 1888{
1875 char *start; 1889 char *start;
1876 port *pt = malloc (sizeof (port)); 1890 port *pt = malloc (sizeof (port));
1877 1891
… …
1891 pt->rep.string.curr = start; 1905 pt->rep.string.curr = start;
1892 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1906 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1893 return pt; 1907 return pt;
1894} 1908}
1895 1909
1896static pointer 1910ecb_cold static pointer
1897port_from_scratch (SCHEME_P) 1911port_from_scratch (SCHEME_P)
1898{ 1912{
1899 port *pt = port_rep_from_scratch (SCHEME_A); 1913 port *pt = port_rep_from_scratch (SCHEME_A);
1900 1914
1901 if (!pt && USE_ERROR_CHECKING) 1915 if (!pt && USE_ERROR_CHECKING)
1902 return NIL; 1916 return NIL;
1903 1917
1904 return mk_port (SCHEME_A_ pt); 1918 return mk_port (SCHEME_A_ pt);
1905} 1919}
1906 1920
1907static void 1921ecb_cold static void
1908port_close (SCHEME_P_ pointer p, int flag) 1922port_close (SCHEME_P_ pointer p, int flag)
1909{ 1923{
1910 port *pt = p->object.port; 1924 port *pt = port (p);
1911 1925
1912 pt->kind &= ~flag; 1926 pt->kind &= ~flag;
1913 1927
1914 if ((pt->kind & (port_input | port_output)) == 0) 1928 if ((pt->kind & (port_input | port_output)) == 0)
1915 { 1929 {
… …
1936/* get new character from input file */ 1950/* get new character from input file */
1937static int 1951static int
1938inchar (SCHEME_P) 1952inchar (SCHEME_P)
1939{ 1953{
1940 int c; 1954 int c;
1941 port *pt; 1955 port *pt = port (SCHEME_V->inport);
1942
1943 pt = SCHEME_V->inport->object.port;
1944 1956
1945 if (pt->kind & port_saw_EOF) 1957 if (pt->kind & port_saw_EOF)
1946 return EOF; 1958 return EOF;
1947 1959
1948 c = basic_inchar (pt); 1960 c = basic_inchar (pt);
… …
2015 port *pt; 2027 port *pt;
2016 2028
2017 if (c == EOF) 2029 if (c == EOF)
2018 return; 2030 return;
2019 2031
2020 pt = SCHEME_V->inport->object.port; 2032 pt = port (SCHEME_V->inport);
2021 pt->unget = c; 2033 pt->unget = c;
2022#else 2034#else
2023 if (c == EOF) 2035 if (c == EOF)
2024 return; 2036 return;
2025 2037
2026 ungot = c; 2038 ungot = c;
2027#endif 2039#endif
2028} 2040}
2029 2041
2030#if USE_PORTS 2042#if USE_PORTS
2031static int 2043ecb_cold static int
2032realloc_port_string (SCHEME_P_ port *p) 2044realloc_port_string (SCHEME_P_ port *p)
2033{ 2045{
2034 char *start = p->rep.string.start; 2046 char *start = p->rep.string.start;
2035 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE; 2047 size_t new_size = p->rep.string.past_the_end - start + 1 + BLOCK_SIZE;
2036 char *str = malloc (new_size); 2048 char *str = malloc (new_size);
… …
2049 else 2061 else
2050 return 0; 2062 return 0;
2051} 2063}
2052#endif 2064#endif
2053 2065
2054INTERFACE void 2066ecb_cold INTERFACE void
2055putstr (SCHEME_P_ const char *s) 2067putstr (SCHEME_P_ const char *s)
2056{ 2068{
2057#if USE_PORTS 2069#if USE_PORTS
2058 port *pt = SCHEME_V->outport->object.port; 2070 port *pt = port (SCHEME_V->outport);
2059 2071
2060 if (pt->kind & port_file) 2072 if (pt->kind & port_file)
2061 write (pt->rep.stdio.file, s, strlen (s)); 2073 write (pt->rep.stdio.file, s, strlen (s));
2062 else 2074 else
2063 for (; *s; s++) 2075 for (; *s; s++)
… …
2065 *pt->rep.string.curr++ = *s; 2077 *pt->rep.string.curr++ = *s;
2066 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt)) 2078 else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2067 *pt->rep.string.curr++ = *s; 2079 *pt->rep.string.curr++ = *s;
2068 2080
2069#else 2081#else
2070 xwrstr (s); 2082 write (pt->rep.stdio.file, s, strlen (s));
2071#endif 2083#endif
2072} 2084}
2073 2085
2074static void 2086ecb_cold static void
2075putchars (SCHEME_P_ const char *s, int len) 2087putchars (SCHEME_P_ const char *s, int len)
2076{ 2088{
2077#if USE_PORTS 2089#if USE_PORTS
2078 port *pt = SCHEME_V->outport->object.port; 2090 port *pt = port (SCHEME_V->outport);
2079 2091
2080 if (pt->kind & port_file) 2092 if (pt->kind & port_file)
2081 write (pt->rep.stdio.file, s, len); 2093 write (pt->rep.stdio.file, s, len);
2082 else 2094 else
2083 { 2095 {
… …
2093#else 2105#else
2094 write (1, s, len); 2106 write (1, s, len);
2095#endif 2107#endif
2096} 2108}
2097 2109
2098INTERFACE void 2110ecb_cold INTERFACE void
2099putcharacter (SCHEME_P_ int c) 2111putcharacter (SCHEME_P_ int c)
2100{ 2112{
2101#if USE_PORTS 2113#if USE_PORTS
2102 port *pt = SCHEME_V->outport->object.port; 2114 port *pt = port (SCHEME_V->outport);
2103 2115
2104 if (pt->kind & port_file) 2116 if (pt->kind & port_file)
2105 { 2117 {
2106 char cc = c; 2118 char cc = c;
2107 write (pt->rep.stdio.file, &cc, 1); 2119 write (pt->rep.stdio.file, &cc, 1);
… …
2119 write (1, &c, 1); 2131 write (1, &c, 1);
2120#endif 2132#endif
2121} 2133}
2122 2134
2123/* read characters up to delimiter, but cater to character constants */ 2135/* read characters up to delimiter, but cater to character constants */
2124static char * 2136ecb_cold static char *
2125readstr_upto (SCHEME_P_ int skip, const char *delim) 2137readstr_upto (SCHEME_P_ int skip, const char *delim)
2126{ 2138{
2127 char *p = SCHEME_V->strbuff + skip; 2139 char *p = SCHEME_V->strbuff + skip;
2128 2140
2129 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A)))); 2141 while ((p - SCHEME_V->strbuff < sizeof (SCHEME_V->strbuff)) && !is_one_of (delim, (*p++ = inchar (SCHEME_A))));
… …
2138 2150
2139 return SCHEME_V->strbuff; 2151 return SCHEME_V->strbuff;
2140} 2152}
2141 2153
2142/* read string expression "xxx...xxx" */ 2154/* read string expression "xxx...xxx" */
2143static pointer 2155ecb_cold static pointer
2144readstrexp (SCHEME_P_ char delim) 2156readstrexp (SCHEME_P_ char delim)
2145{ 2157{
2146 char *p = SCHEME_V->strbuff; 2158 char *p = SCHEME_V->strbuff;
2147 int c; 2159 int c;
2148 int c1 = 0; 2160 int c1 = 0;
… …
2181 case '7': 2193 case '7':
2182 state = st_oct1; 2194 state = st_oct1;
2183 c1 = c - '0'; 2195 c1 = c - '0';
2184 break; 2196 break;
2185 2197
2198 case 'a': *p++ = '\a'; state = st_ok; break;
2199 case 'n': *p++ = '\n'; state = st_ok; break;
2200 case 'r': *p++ = '\r'; state = st_ok; break;
2201 case 't': *p++ = '\t'; state = st_ok; break;
2202
2203 //TODO: \whitespace eol whitespace
2204
2205 //TODO: x should end in ;, not two-digit hex
2186 case 'x': 2206 case 'x':
2187 case 'X': 2207 case 'X':
2188 state = st_x1; 2208 state = st_x1;
2189 c1 = 0; 2209 c1 = 0;
2190 break;
2191
2192 case 'n':
2193 *p++ = '\n';
2194 state = st_ok;
2195 break;
2196
2197 case 't':
2198 *p++ = '\t';
2199 state = st_ok;
2200 break;
2201
2202 case 'r':
2203 *p++ = '\r';
2204 state = st_ok;
2205 break; 2210 break;
2206 2211
2207 default: 2212 default:
2208 *p++ = c; 2213 *p++ = c;
2209 state = st_ok; 2214 state = st_ok;
… …
2261 } 2266 }
2262 } 2267 }
2263} 2268}
2264 2269
2265/* check c is in chars */ 2270/* check c is in chars */
2266ecb_inline int 2271ecb_cold int
2267is_one_of (const char *s, int c) 2272is_one_of (const char *s, int c)
2268{ 2273{
2269 if (c == EOF)
2270 return 1;
2271
2272 return !!strchr (s, c); 2274 return c == EOF || !!strchr (s, c);
2273} 2275}
2274 2276
2275/* skip white characters */ 2277/* skip white characters */
2276ecb_inline int 2278ecb_cold int
2277skipspace (SCHEME_P) 2279skipspace (SCHEME_P)
2278{ 2280{
2279 int c, curr_line = 0; 2281 int c, curr_line = 0;
2280 2282
2281 do 2283 do
2282 { 2284 {
2283 c = inchar (SCHEME_A); 2285 c = inchar (SCHEME_A);
2286
2284#if SHOW_ERROR_LINE 2287#if SHOW_ERROR_LINE
2285 if (c == '\n') 2288 if (ecb_expect_false (c == '\n'))
2286 curr_line++; 2289 curr_line++;
2287#endif 2290#endif
2291
2292 if (ecb_expect_false (c == EOF))
2293 return c;
2288 } 2294 }
2289 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2295 while (is_one_of (WHITESPACE, c));
2290 2296
2291 /* record it */ 2297 /* record it */
2292#if SHOW_ERROR_LINE 2298#if SHOW_ERROR_LINE
2293 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file) 2299 if (SCHEME_V->load_stack[SCHEME_V->file_i].kind & port_file)
2294 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line; 2300 SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line += curr_line;
2295#endif 2301#endif
2296 2302
2297 if (c != EOF)
2298 {
2299 backchar (SCHEME_A_ c); 2303 backchar (SCHEME_A_ c);
2300 return 1; 2304 return 1;
2301 }
2302 else
2303 return EOF;
2304} 2305}
2305 2306
2306/* get token */ 2307/* get token */
2307static int 2308ecb_cold static int
2308token (SCHEME_P) 2309token (SCHEME_P)
2309{ 2310{
2310 int c = skipspace (SCHEME_A); 2311 int c = skipspace (SCHEME_A);
2311 2312
2312 if (c == EOF) 2313 if (c == EOF)
… …
2324 return TOK_RPAREN; 2325 return TOK_RPAREN;
2325 2326
2326 case '.': 2327 case '.':
2327 c = inchar (SCHEME_A); 2328 c = inchar (SCHEME_A);
2328 2329
2329 if (is_one_of (" \n\t", c)) 2330 if (is_one_of (WHITESPACE, c))
2330 return TOK_DOT; 2331 return TOK_DOT;
2331 else 2332 else
2332 { 2333 {
2333 backchar (SCHEME_A_ c); 2334 backchar (SCHEME_A_ c);
2334 return TOK_DOTATOM; 2335 return TOK_DOTATOM;
… …
2410} 2411}
2411 2412
2412/* ========== Routines for Printing ========== */ 2413/* ========== Routines for Printing ========== */
2413#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2414#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2414 2415
2415static void 2416ecb_cold static void
2416printslashstring (SCHEME_P_ char *p, int len) 2417printslashstring (SCHEME_P_ char *p, int len)
2417{ 2418{
2418 int i; 2419 int i;
2419 unsigned char *s = (unsigned char *) p; 2420 unsigned char *s = (unsigned char *) p;
2420 2421
… …
2476 2477
2477 putcharacter (SCHEME_A_ '"'); 2478 putcharacter (SCHEME_A_ '"');
2478} 2479}
2479 2480
2480/* print atoms */ 2481/* print atoms */
2481static void 2482ecb_cold static void
2482printatom (SCHEME_P_ pointer l, int f) 2483printatom (SCHEME_P_ pointer l, int f)
2483{ 2484{
2484 char *p; 2485 char *p;
2485 int len; 2486 int len;
2486 2487
2487 atom2str (SCHEME_A_ l, f, &p, &len); 2488 atom2str (SCHEME_A_ l, f, &p, &len);
2488 putchars (SCHEME_A_ p, len); 2489 putchars (SCHEME_A_ p, len);
2489} 2490}
2490 2491
2491/* Uses internal buffer unless string pointer is already available */ 2492/* Uses internal buffer unless string pointer is already available */
2492static void 2493ecb_cold static void
2493atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2494atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2494{ 2495{
2495 char *p; 2496 char *p;
2496 2497
2497 if (l == NIL) 2498 if (l == NIL)
… …
2704 return car (d); 2705 return car (d);
2705 2706
2706 p = cons (car (d), cdr (d)); 2707 p = cons (car (d), cdr (d));
2707 q = p; 2708 q = p;
2708 2709
2709 while (cdr (cdr (p)) != NIL) 2710 while (cddr (p) != NIL)
2710 { 2711 {
2711 d = cons (car (p), cdr (p)); 2712 d = cons (car (p), cdr (p));
2712 2713
2713 if (cdr (cdr (p)) != NIL) 2714 if (cddr (p) != NIL)
2714 p = cdr (d); 2715 p = cdr (d);
2715 } 2716 }
2716 2717
2717 set_cdr (p, car (cdr (p))); 2718 set_cdr (p, cadr (p));
2718 return q; 2719 return q;
2719} 2720}
2720 2721
2721/* reverse list -- produce new list */ 2722/* reverse list -- produce new list */
2722static pointer 2723ecb_hot static pointer
2723reverse (SCHEME_P_ pointer a) 2724reverse (SCHEME_P_ pointer a)
2724{ 2725{
2725 /* a must be checked by gc */ 2726 /* a must be checked by gc */
2726 pointer p = NIL; 2727 pointer p = NIL;
2727 2728
… …
2730 2731
2731 return p; 2732 return p;
2732} 2733}
2733 2734
2734/* reverse list --- in-place */ 2735/* reverse list --- in-place */
2735static pointer 2736ecb_hot static pointer
2736reverse_in_place (SCHEME_P_ pointer term, pointer list) 2737reverse_in_place (SCHEME_P_ pointer term, pointer list)
2737{ 2738{
2738 pointer result = term; 2739 pointer result = term;
2739 pointer p = list; 2740 pointer p = list;
2740 2741
… …
2748 2749
2749 return result; 2750 return result;
2750} 2751}
2751 2752
2752/* append list -- produce new list (in reverse order) */ 2753/* append list -- produce new list (in reverse order) */
2753static pointer 2754ecb_hot static pointer
2754revappend (SCHEME_P_ pointer a, pointer b) 2755revappend (SCHEME_P_ pointer a, pointer b)
2755{ 2756{
2756 pointer result = a; 2757 pointer result = a;
2757 pointer p = b; 2758 pointer p = b;
2758 2759
… …
2767 2768
2768 return S_F; /* signal an error */ 2769 return S_F; /* signal an error */
2769} 2770}
2770 2771
2771/* equivalence of atoms */ 2772/* equivalence of atoms */
2772int 2773ecb_hot int
2773eqv (pointer a, pointer b) 2774eqv (pointer a, pointer b)
2774{ 2775{
2775 if (is_string (a)) 2776 if (is_string (a))
2776 { 2777 {
2777 if (is_string (b)) 2778 if (is_string (b))
… …
2871 } 2872 }
2872 else 2873 else
2873 set_car (env, immutable_cons (slot, car (env))); 2874 set_car (env, immutable_cons (slot, car (env)));
2874} 2875}
2875 2876
2876static pointer 2877ecb_hot static pointer
2877find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2878find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2878{ 2879{
2879 pointer x, y; 2880 pointer x, y;
2880 2881
2881 for (x = env; x != NIL; x = cdr (x)) 2882 for (x = env; x != NIL; x = cdr (x))
… …
2902 return NIL; 2903 return NIL;
2903} 2904}
2904 2905
2905#else /* USE_ALIST_ENV */ 2906#else /* USE_ALIST_ENV */
2906 2907
2907ecb_inline void 2908static void
2908new_frame_in_env (SCHEME_P_ pointer old_env) 2909new_frame_in_env (SCHEME_P_ pointer old_env)
2909{ 2910{
2910 SCHEME_V->envir = immutable_cons (NIL, old_env); 2911 SCHEME_V->envir = immutable_cons (NIL, old_env);
2911 setenvironment (SCHEME_V->envir); 2912 setenvironment (SCHEME_V->envir);
2912} 2913}
2913 2914
2914ecb_inline void 2915static void
2915new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2916new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2916{ 2917{
2917 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2918 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2918} 2919}
2919 2920
2920static pointer 2921ecb_hot static pointer
2921find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2922find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2922{ 2923{
2923 pointer x, y; 2924 pointer x, y;
2924 2925
2925 for (x = env; x != NIL; x = cdr (x)) 2926 for (x = env; x != NIL; x = cdr (x))
… …
2939 return NIL; 2940 return NIL;
2940} 2941}
2941 2942
2942#endif /* USE_ALIST_ENV else */ 2943#endif /* USE_ALIST_ENV else */
2943 2944
2944ecb_inline void 2945static void
2945new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2946new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2946{ 2947{
2948 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2947 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value); 2949 new_slot_spec_in_env (SCHEME_A_ SCHEME_V->envir, variable, value);
2948} 2950}
2949 2951
2950ecb_inline void 2952static void
2951set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2953set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2952{ 2954{
2953 set_cdr (slot, value); 2955 set_cdr (slot, value);
2954} 2956}
2955 2957
2956ecb_inline pointer 2958static pointer
2957slot_value_in_env (pointer slot) 2959slot_value_in_env (pointer slot)
2958{ 2960{
2959 return cdr (slot); 2961 return cdr (slot);
2960} 2962}
2961 2963
2962/* ========== Evaluation Cycle ========== */ 2964/* ========== Evaluation Cycle ========== */
2963 2965
2964static int 2966ecb_cold static int
2965xError_1 (SCHEME_P_ const char *s, pointer a) 2967xError_1 (SCHEME_P_ const char *s, pointer a)
2966{ 2968{
2967#if USE_ERROR_HOOK 2969#if USE_ERROR_HOOK
2968 pointer x; 2970 pointer x;
2969 pointer hdl = SCHEME_V->ERROR_HOOK; 2971 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3045 pointer code; 3047 pointer code;
3046}; 3048};
3047 3049
3048# define STACK_GROWTH 3 3050# define STACK_GROWTH 3
3049 3051
3050static void 3052ecb_hot static void
3051s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3053s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3052{ 3054{
3053 int nframes = (uintptr_t)SCHEME_V->dump; 3055 int nframes = (uintptr_t)SCHEME_V->dump;
3054 struct dump_stack_frame *next_frame; 3056 struct dump_stack_frame *next_frame;
3055 3057
3056 /* enough room for the next frame? */ 3058 /* enough room for the next frame? */
3057 if (nframes >= SCHEME_V->dump_size) 3059 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3058 { 3060 {
3059 SCHEME_V->dump_size += STACK_GROWTH; 3061 SCHEME_V->dump_size += STACK_GROWTH;
3060 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size); 3062 SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3061 } 3063 }
3062 3064
… …
3068 next_frame->code = code; 3070 next_frame->code = code;
3069 3071
3070 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3072 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3071} 3073}
3072 3074
3073static int 3075static ecb_hot int
3074xs_return (SCHEME_P_ pointer a) 3076xs_return (SCHEME_P_ pointer a)
3075{ 3077{
3076 int nframes = (uintptr_t)SCHEME_V->dump; 3078 int nframes = (uintptr_t)SCHEME_V->dump;
3077 struct dump_stack_frame *frame; 3079 struct dump_stack_frame *frame;
3078 3080
… …
3089 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3091 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3090 3092
3091 return 0; 3093 return 0;
3092} 3094}
3093 3095
3094ecb_inline void 3096ecb_cold void
3095dump_stack_reset (SCHEME_P) 3097dump_stack_reset (SCHEME_P)
3096{ 3098{
3097 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */ 3099 /* in this implementation, SCHEME_V->dump is the number of frames on the stack */
3098 SCHEME_V->dump = (pointer)+0; 3100 SCHEME_V->dump = (pointer)+0;
3099} 3101}
3100 3102
3101ecb_inline void 3103ecb_cold void
3102dump_stack_initialize (SCHEME_P) 3104dump_stack_initialize (SCHEME_P)
3103{ 3105{
3104 SCHEME_V->dump_size = 0; 3106 SCHEME_V->dump_size = 0;
3105 SCHEME_V->dump_base = 0; 3107 SCHEME_V->dump_base = 0;
3106 dump_stack_reset (SCHEME_A); 3108 dump_stack_reset (SCHEME_A);
3107} 3109}
3108 3110
3109static void 3111ecb_cold static void
3110dump_stack_free (SCHEME_P) 3112dump_stack_free (SCHEME_P)
3111{ 3113{
3112 free (SCHEME_V->dump_base); 3114 free (SCHEME_V->dump_base);
3113 SCHEME_V->dump_base = 0; 3115 SCHEME_V->dump_base = 0;
3114 SCHEME_V->dump = (pointer)0; 3116 SCHEME_V->dump = (pointer)0;
3115 SCHEME_V->dump_size = 0; 3117 SCHEME_V->dump_size = 0;
3116} 3118}
3117 3119
3118static void 3120ecb_cold static void
3119dump_stack_mark (SCHEME_P) 3121dump_stack_mark (SCHEME_P)
3120{ 3122{
3121 int nframes = (uintptr_t)SCHEME_V->dump; 3123 int nframes = (uintptr_t)SCHEME_V->dump;
3122 int i; 3124 int i;
3123 3125
… …
3129 mark (frame->envir); 3131 mark (frame->envir);
3130 mark (frame->code); 3132 mark (frame->code);
3131 } 3133 }
3132} 3134}
3133 3135
3134static pointer 3136ecb_cold static pointer
3135ss_get_cont (SCHEME_P) 3137ss_get_cont (SCHEME_P)
3136{ 3138{
3137 int nframes = (uintptr_t)SCHEME_V->dump; 3139 int nframes = (uintptr_t)SCHEME_V->dump;
3138 int i; 3140 int i;
3139 3141
… …
3151 } 3153 }
3152 3154
3153 return cont; 3155 return cont;
3154} 3156}
3155 3157
3156static void 3158ecb_cold static void
3157ss_set_cont (SCHEME_P_ pointer cont) 3159ss_set_cont (SCHEME_P_ pointer cont)
3158{ 3160{
3159 int i = 0; 3161 int i = 0;
3160 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3162 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3161 3163
… …
3173 SCHEME_V->dump = (pointer)(uintptr_t)i; 3175 SCHEME_V->dump = (pointer)(uintptr_t)i;
3174} 3176}
3175 3177
3176#else 3178#else
3177 3179
3178ecb_inline void 3180ecb_cold void
3179dump_stack_reset (SCHEME_P) 3181dump_stack_reset (SCHEME_P)
3180{ 3182{
3181 SCHEME_V->dump = NIL; 3183 SCHEME_V->dump = NIL;
3182} 3184}
3183 3185
3184ecb_inline void 3186ecb_cold void
3185dump_stack_initialize (SCHEME_P) 3187dump_stack_initialize (SCHEME_P)
3186{ 3188{
3187 dump_stack_reset (SCHEME_A); 3189 dump_stack_reset (SCHEME_A);
3188} 3190}
3189 3191
3190static void 3192ecb_cold static void
3191dump_stack_free (SCHEME_P) 3193dump_stack_free (SCHEME_P)
3192{ 3194{
3193 SCHEME_V->dump = NIL; 3195 SCHEME_V->dump = NIL;
3194} 3196}
3195 3197
3196static int 3198ecb_hot static int
3197xs_return (SCHEME_P_ pointer a) 3199xs_return (SCHEME_P_ pointer a)
3198{ 3200{
3199 pointer dump = SCHEME_V->dump; 3201 pointer dump = SCHEME_V->dump;
3200 3202
3201 SCHEME_V->value = a; 3203 SCHEME_V->value = a;
… …
3211 SCHEME_V->dump = dump; 3213 SCHEME_V->dump = dump;
3212 3214
3213 return 0; 3215 return 0;
3214} 3216}
3215 3217
3216static void 3218ecb_hot static void
3217s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3219s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3218{ 3220{
3219 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3221 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3220 cons (args, 3222 cons (args,
3221 cons (SCHEME_V->envir, 3223 cons (SCHEME_V->envir,
3222 cons (code, 3224 cons (code,
3223 SCHEME_V->dump)))); 3225 SCHEME_V->dump))));
3224} 3226}
3225 3227
3226static void 3228ecb_cold static void
3227dump_stack_mark (SCHEME_P) 3229dump_stack_mark (SCHEME_P)
3228{ 3230{
3229 mark (SCHEME_V->dump); 3231 mark (SCHEME_V->dump);
3230} 3232}
3231 3233
3232static pointer 3234ecb_cold static pointer
3233ss_get_cont (SCHEME_P) 3235ss_get_cont (SCHEME_P)
3234{ 3236{
3235 return SCHEME_V->dump; 3237 return SCHEME_V->dump;
3236} 3238}
3237 3239
3238static void 3240ecb_cold static void
3239ss_set_cont (SCHEME_P_ pointer cont) 3241ss_set_cont (SCHEME_P_ pointer cont)
3240{ 3242{
3241 SCHEME_V->dump = cont; 3243 SCHEME_V->dump = cont;
3242} 3244}
3243 3245
3244#endif 3246#endif
3245 3247
3246#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3248#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3247 3249
3250#if EXPERIMENT
3248static int 3251static int
3252debug (SCHEME_P_ int indent, pointer x)
3253{
3254 int c;
3255
3256 if (is_syntax (x))
3257 {
3258 printf ("%*ssyntax<%s,%d>\n", indent, "", syntaxname(x),syntaxnum(x));
3259 return 8 + 8;
3260 }
3261
3262 if (x == NIL)
3263 {
3264 printf ("%*sNIL\n", indent, "");
3265 return 3;
3266 }
3267
3268 switch (type (x))
3269 {
3270 case T_INTEGER:
3271 printf ("%*sI<%d>%p\n", indent, "", (int)ivalue_unchecked (x), x);
3272 return 32+8;
3273
3274 case T_SYMBOL:
3275 printf ("%*sS<%s>\n", indent, "", symname (x));
3276 return 24+8;
3277
3278 case T_CLOSURE:
3279 printf ("%*sS<%s>\n", indent, "", "closure");
3280 debug (SCHEME_A_ indent + 3, cdr(x));
3281 return 32 + debug (SCHEME_A_ indent + 3, car (x));
3282
3283 case T_PAIR:
3284 printf ("%*spair %p %p\n", indent, "", car(x),cdr(x));
3285 c = debug (SCHEME_A_ indent + 3, car (x));
3286 c += debug (SCHEME_A_ indent + 3, cdr (x));
3287 return c + 1;
3288
3289 case T_PORT:
3290 printf ("%*sS<%s>\n", indent, "", "port");
3291 return 24+8;
3292
3293 case T_VECTOR:
3294 printf ("%*sS<%s>\n", indent, "", "vector");
3295 return 24+8;
3296
3297 case T_ENVIRONMENT:
3298 printf ("%*sS<%s>\n", indent, "", "environment");
3299 return 0 + debug (SCHEME_A_ indent + 3, car (x));
3300
3301 default:
3302 printf ("unhandled type %d\n", type (x));
3303 break;
3304 }
3305}
3306#endif
3307
3308/* syntax, eval, core, ... */
3309ecb_hot static int
3249opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3310opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3250{ 3311{
3251 pointer args = SCHEME_V->args; 3312 pointer args = SCHEME_V->args;
3252 pointer x, y; 3313 pointer x, y;
3253 3314
3254 switch (op) 3315 switch (op)
3255 { 3316 {
3317#if EXPERIMENT //D
3318 case OP_DEBUG:
3319 printf ("len = %d\n", debug (SCHEME_A_ 0, args) / 8);
3320 printf ("\n");
3321 s_return (S_T);
3322#endif
3256 case OP_LOAD: /* load */ 3323 case OP_LOAD: /* load */
3257 if (file_interactive (SCHEME_A)) 3324 if (file_interactive (SCHEME_A))
3258 { 3325 {
3259 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3326 putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3260 //D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args))); 3327 //D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3261 } 3328 }
3262 3329
3263 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3330 if (!file_push (SCHEME_A_ strvalue (car (args))))
3264 Error_1 ("unable to open", car (args)); 3331 Error_1 ("unable to open", car (args));
3265 else 3332 else
… …
3269 } 3336 }
3270 3337
3271 case OP_T0LVL: /* top level */ 3338 case OP_T0LVL: /* top level */
3272 3339
3273 /* If we reached the end of file, this loop is done. */ 3340 /* If we reached the end of file, this loop is done. */
3274 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3341 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3275 { 3342 {
3276 if (SCHEME_V->file_i == 0) 3343 if (SCHEME_V->file_i == 0)
3277 { 3344 {
3278 SCHEME_V->args = NIL; 3345 SCHEME_V->args = NIL;
3279 s_goto (OP_QUIT); 3346 s_goto (OP_QUIT);
… …
3357#endif 3424#endif
3358 if (is_symbol (SCHEME_V->code)) /* symbol */ 3425 if (is_symbol (SCHEME_V->code)) /* symbol */
3359 { 3426 {
3360 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1); 3427 x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3361 3428
3362 if (x != NIL) 3429 if (x == NIL)
3363 s_return (slot_value_in_env (x));
3364 else
3365 Error_1 ("eval: unbound variable:", SCHEME_V->code); 3430 Error_1 ("eval: unbound variable:", SCHEME_V->code);
3431
3432 s_return (slot_value_in_env (x));
3366 } 3433 }
3367 else if (is_pair (SCHEME_V->code)) 3434 else if (is_pair (SCHEME_V->code))
3368 { 3435 {
3369 x = car (SCHEME_V->code); 3436 x = car (SCHEME_V->code);
3370 3437
… …
3447 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3514 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3448 else if (is_foreign (SCHEME_V->code)) 3515 else if (is_foreign (SCHEME_V->code))
3449 { 3516 {
3450 /* Keep nested calls from GC'ing the arglist */ 3517 /* Keep nested calls from GC'ing the arglist */
3451 push_recent_alloc (SCHEME_A_ args, NIL); 3518 push_recent_alloc (SCHEME_A_ args, NIL);
3452 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3519 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3453 3520
3454 s_return (x); 3521 s_return (x);
3455 } 3522 }
3456 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */ 3523 else if (is_closure (SCHEME_V->code) || is_macro (SCHEME_V->code) || is_promise (SCHEME_V->code)) /* CLOSURE */
3457 { 3524 {
… …
3494 3561
3495 case OP_DOMACRO: /* do macro */ 3562 case OP_DOMACRO: /* do macro */
3496 SCHEME_V->code = SCHEME_V->value; 3563 SCHEME_V->code = SCHEME_V->value;
3497 s_goto (OP_EVAL); 3564 s_goto (OP_EVAL);
3498 3565
3499#if 1
3500
3501 case OP_LAMBDA: /* lambda */ 3566 case OP_LAMBDA: /* lambda */
3502 /* If the hook is defined, apply it to SCHEME_V->code, otherwise 3567 /* If the hook is defined, apply it to SCHEME_V->code, otherwise
3503 set SCHEME_V->value fall thru */ 3568 set SCHEME_V->value fall thru */
3504 { 3569 {
3505 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1); 3570 pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
… …
3511 SCHEME_V->code = slot_value_in_env (f); 3576 SCHEME_V->code = slot_value_in_env (f);
3512 s_goto (OP_APPLY); 3577 s_goto (OP_APPLY);
3513 } 3578 }
3514 3579
3515 SCHEME_V->value = SCHEME_V->code; 3580 SCHEME_V->value = SCHEME_V->code;
3516 /* Fallthru */
3517 } 3581 }
3582 /* Fallthru */
3518 3583
3519 case OP_LAMBDA1: 3584 case OP_LAMBDA1:
3520 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir)); 3585 s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3521
3522#else
3523
3524 case OP_LAMBDA: /* lambda */
3525 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3526
3527#endif
3528 3586
3529 case OP_MKCLOSURE: /* make-closure */ 3587 case OP_MKCLOSURE: /* make-closure */
3530 x = car (args); 3588 x = car (args);
3531 3589
3532 if (car (x) == SCHEME_V->LAMBDA) 3590 if (car (x) == SCHEME_V->LAMBDA)
… …
3654 case OP_LET2: /* let */ 3712 case OP_LET2: /* let */
3655 new_frame_in_env (SCHEME_A_ SCHEME_V->envir); 3713 new_frame_in_env (SCHEME_A_ SCHEME_V->envir);
3656 3714
3657 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args; 3715 for (x = is_symbol (car (SCHEME_V->code)) ? cadr (SCHEME_V->code) : car (SCHEME_V->code), y = args;
3658 y != NIL; x = cdr (x), y = cdr (y)) 3716 y != NIL; x = cdr (x), y = cdr (y))
3659 { if (is_pair(caar(x))){debug(SCHEME_A_ 0, SCHEME_V->code);};//D
3660 pointer z = caar (x);
3661 if(is_pair(z)) z = car(z);//D
3662 new_slot_in_env (SCHEME_A_ z, car (y));
3663 }
3664 //new_slot_in_env (SCHEME_A_ caar (x), car (y)); 3717 new_slot_in_env (SCHEME_A_ caar (x), car (y));
3665 3718
3666 if (is_symbol (car (SCHEME_V->code))) /* named let */ 3719 if (is_symbol (car (SCHEME_V->code))) /* named let */
3667 { 3720 {
3668 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x)) 3721 for (x = cadr (SCHEME_V->code), args = NIL; x != NIL; x = cdr (x))
3669 { 3722 {
… …
3947 } 4000 }
3948 4001
3949 if (USE_ERROR_CHECKING) abort (); 4002 if (USE_ERROR_CHECKING) abort ();
3950} 4003}
3951 4004
3952static int 4005/* math, cxr */
4006ecb_hot static int
3953opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4007opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3954{ 4008{
3955 pointer args = SCHEME_V->args; 4009 pointer args = SCHEME_V->args;
3956 pointer x = car (args); 4010 pointer x = car (args);
3957 num v; 4011 num v;
3958 4012
3959 switch (op) 4013 switch (op)
3960 { 4014 {
3961#if USE_MATH 4015#if USE_MATH
3962 case OP_INEX2EX: /* inexact->exact */ 4016 case OP_INEX2EX: /* inexact->exact */
3963 {
3964 if (is_integer (x)) 4017 if (!is_integer (x))
3965 s_return (x); 4018 {
3966
3967 RVALUE r = rvalue_unchecked (x); 4019 RVALUE r = rvalue_unchecked (x);
3968 4020
3969 if (r == (RVALUE)(IVALUE)r) 4021 if (r == (RVALUE)(IVALUE)r)
3970 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4022 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3971 else 4023 else
3972 Error_1 ("inexact->exact: not integral:", x); 4024 Error_1 ("inexact->exact: not integral:", x);
3973 } 4025 }
3974 4026
4027 s_return (x);
4028
4029 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4030 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4031 case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
4032 case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4033
4034 case OP_SQRT: s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3975 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x)))); 4035 case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
3976 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x)))); 4036 case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
4037 / (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
3977 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x)))); 4038 case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
3978 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x)))); 4039 case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
3979 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x)))); 4040 case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
3980 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x)))); 4041 case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
3981 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x)))); 4042 case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
3982 4043
3983 case OP_ATAN: 4044 case OP_ATAN:
4045 s_return (mk_real (SCHEME_A_
3984 if (cdr (args) == NIL) 4046 cdr (args) == NIL
3985 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4047 ? atan (rvalue (x))
3986 else 4048 : atan2 (rvalue (x), rvalue (cadr (args)))));
3987 {
3988 pointer y = cadr (args);
3989 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3990 }
3991
3992 case OP_SQRT:
3993 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3994 4049
3995 case OP_EXPT: 4050 case OP_EXPT:
3996 { 4051 {
3997 RVALUE result; 4052 RVALUE result;
3998 int real_result = 1; 4053 int real_result = 1;
… …
4021 if (real_result) 4076 if (real_result)
4022 s_return (mk_real (SCHEME_A_ result)); 4077 s_return (mk_real (SCHEME_A_ result));
4023 else 4078 else
4024 s_return (mk_integer (SCHEME_A_ result)); 4079 s_return (mk_integer (SCHEME_A_ result));
4025 } 4080 }
4026
4027 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4028 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4029
4030 case OP_TRUNCATE:
4031 {
4032 RVALUE n = rvalue (x);
4033 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4034 }
4035
4036 case OP_ROUND:
4037 if (is_integer (x))
4038 s_return (x);
4039
4040 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4041#endif 4081#endif
4042 4082
4043 case OP_ADD: /* + */ 4083 case OP_ADD: /* + */
4044 v = num_zero; 4084 v = num_zero;
4045 4085
… …
4133 else 4173 else
4134 Error_0 ("modulo: division by zero"); 4174 Error_0 ("modulo: division by zero");
4135 4175
4136 s_return (mk_number (SCHEME_A_ v)); 4176 s_return (mk_number (SCHEME_A_ v));
4137 4177
4138 case OP_CAR: /* car */ 4178 /* the compiler will optimize this mess... */
4139 s_return (caar (args)); 4179 case OP_CAR: op_car: s_return (car (x));
4140 4180 case OP_CDR: op_cdr: s_return (cdr (x));
4141 case OP_CDR: /* cdr */ 4181 case OP_CAAR: op_caar: x = car (x); goto op_car;
4142 s_return (cdar (args)); 4182 case OP_CADR: op_cadr: x = cdr (x); goto op_car;
4183 case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
4184 case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
4185 case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
4186 case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
4187 case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
4188 case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
4189 case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
4190 case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
4191 case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
4192 case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
4193 case OP_CAAAAR: x = car (x); goto op_caaar;
4194 case OP_CAAADR: x = cdr (x); goto op_caaar;
4195 case OP_CAADAR: x = car (x); goto op_caadr;
4196 case OP_CAADDR: x = cdr (x); goto op_caadr;
4197 case OP_CADAAR: x = car (x); goto op_cadar;
4198 case OP_CADADR: x = cdr (x); goto op_cadar;
4199 case OP_CADDAR: x = car (x); goto op_caddr;
4200 case OP_CADDDR: x = cdr (x); goto op_caddr;
4201 case OP_CDAAAR: x = car (x); goto op_cdaar;
4202 case OP_CDAADR: x = cdr (x); goto op_cdaar;
4203 case OP_CDADAR: x = car (x); goto op_cdadr;
4204 case OP_CDADDR: x = cdr (x); goto op_cdadr;
4205 case OP_CDDAAR: x = car (x); goto op_cddar;
4206 case OP_CDDADR: x = cdr (x); goto op_cddar;
4207 case OP_CDDDAR: x = car (x); goto op_cdddr;
4208 case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4143 4209
4144 case OP_CONS: /* cons */ 4210 case OP_CONS: /* cons */
4145 set_cdr (args, cadr (args)); 4211 set_cdr (args, cadr (args));
4146 s_return (args); 4212 s_return (args);
4147 4213
… …
4321 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4387 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4322 4388
4323 s_return (newstr); 4389 s_return (newstr);
4324 } 4390 }
4325 4391
4326 case OP_SUBSTR: /* substring */ 4392 case OP_STRING_COPY: /* substring/string-copy */
4327 { 4393 {
4328 char *str = strvalue (x); 4394 char *str = strvalue (x);
4329 int index0 = ivalue_unchecked (cadr (args)); 4395 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4330 int index1; 4396 int index1;
4331 int len; 4397 int len;
4332 4398
4333 if (index0 > strlength (x)) 4399 if (index0 > strlength (x))
4334 Error_1 ("substring: start out of bounds:", cadr (args)); 4400 Error_1 ("string->copy: start out of bounds:", cadr (args));
4335 4401
4336 if (cddr (args) != NIL) 4402 if (cddr (args) != NIL)
4337 { 4403 {
4338 index1 = ivalue_unchecked (caddr (args)); 4404 index1 = ivalue_unchecked (caddr (args));
4339 4405
4340 if (index1 > strlength (x) || index1 < index0) 4406 if (index1 > strlength (x) || index1 < index0)
4341 Error_1 ("substring: end out of bounds:", caddr (args)); 4407 Error_1 ("string->copy: end out of bounds:", caddr (args));
4342 } 4408 }
4343 else 4409 else
4344 index1 = strlength (x); 4410 index1 = strlength (x);
4345 4411
4346 len = index1 - index0; 4412 len = index1 - index0;
4347 x = mk_empty_string (SCHEME_A_ len, ' '); 4413 x = mk_counted_string (SCHEME_A_ str + index0, len);
4348 memcpy (strvalue (x), str + index0, len);
4349 strvalue (x)[len] = 0;
4350 4414
4351 s_return (x); 4415 s_return (x);
4352 } 4416 }
4353 4417
4354 case OP_VECTOR: /* vector */ 4418 case OP_VECTOR: /* vector */
… …
4428 } 4492 }
4429 4493
4430 if (USE_ERROR_CHECKING) abort (); 4494 if (USE_ERROR_CHECKING) abort ();
4431} 4495}
4432 4496
4433static int 4497/* relational ops */
4498ecb_hot static int
4434opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4499opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4435{ 4500{
4436 pointer x = SCHEME_V->args; 4501 pointer x = SCHEME_V->args;
4437 4502
4438 for (;;) 4503 for (;;)
… …
4459 } 4524 }
4460 4525
4461 s_return (S_T); 4526 s_return (S_T);
4462} 4527}
4463 4528
4464static int 4529/* predicates */
4530ecb_hot static int
4465opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4531opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4466{ 4532{
4467 pointer args = SCHEME_V->args; 4533 pointer args = SCHEME_V->args;
4468 pointer a = car (args); 4534 pointer a = car (args);
4469 pointer d = cdr (args); 4535 pointer d = cdr (args);
4470 int r; 4536 int r;
4471 4537
4472 switch (op) 4538 switch (op)
4473 { 4539 {
4474 case OP_NOT: /* not */ r = is_false (a) ; break; 4540 case OP_NOT: /* not */ r = is_false (a) ; break;
4475 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T; break; 4541 case OP_BOOLP: /* boolean? */ r = a == S_F || a == S_T ; break;
4476 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4542 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4477 case OP_NULLP: /* null? */ r = a == NIL ; break; 4543 case OP_NULLP: /* null? */ r = a == NIL ; break;
4478 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break; 4544 case OP_SYMBOLP: /* symbol? */ r = is_symbol (a) ; break;
4545 case OP_GENSYMP: /* gensym? */ r = is_gensym (SCHEME_A_ a); break;
4479 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4546 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4480 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4547 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4481 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4548 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4482 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */ 4549 case OP_REALP: /* real? */ r = is_number (a) ; break; /* all numbers are real */
4483 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4550 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4484 4551
4485#if USE_CHAR_CLASSIFIERS 4552#if USE_CHAR_CLASSIFIERS
4486 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break; 4553 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4487 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break; 4554 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4488 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break; 4555 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
… …
4515 } 4582 }
4516 4583
4517 s_retbool (r); 4584 s_retbool (r);
4518} 4585}
4519 4586
4520static int 4587/* promises, list ops, ports */
4588ecb_hot static int
4521opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4589opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4522{ 4590{
4523 pointer args = SCHEME_V->args; 4591 pointer args = SCHEME_V->args;
4524 pointer a = car (args); 4592 pointer a = car (args);
4525 pointer x, y; 4593 pointer x, y;
… …
4538 } 4606 }
4539 else 4607 else
4540 s_return (SCHEME_V->code); 4608 s_return (SCHEME_V->code);
4541 4609
4542 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4610 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4543 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4611 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4544 s_return (SCHEME_V->value); 4612 s_return (SCHEME_V->value);
4545 4613
4546#if USE_PORTS 4614#if USE_PORTS
4615
4616 case OP_EOF_OBJECT: /* eof-object */
4617 s_return (S_EOF);
4547 4618
4548 case OP_WRITE: /* write */ 4619 case OP_WRITE: /* write */
4549 case OP_DISPLAY: /* display */ 4620 case OP_DISPLAY: /* display */
4550 case OP_WRITE_CHAR: /* write-char */ 4621 case OP_WRITE_CHAR: /* write-char */
4551 if (is_pair (cdr (SCHEME_V->args))) 4622 if (is_pair (cdr (SCHEME_V->args)))
… …
4693 SCHEME_V->gc_verbose = (a != S_F); 4764 SCHEME_V->gc_verbose = (a != S_F);
4694 s_retbool (was); 4765 s_retbool (was);
4695 } 4766 }
4696 4767
4697 case OP_NEWSEGMENT: /* new-segment */ 4768 case OP_NEWSEGMENT: /* new-segment */
4769#if 0
4698 if (!is_pair (args) || !is_number (a)) 4770 if (!is_pair (args) || !is_number (a))
4699 Error_0 ("new-segment: argument must be a number"); 4771 Error_0 ("new-segment: argument must be a number");
4700 4772#endif
4701 alloc_cellseg (SCHEME_A_ ivalue (a)); 4773 s_retbool (alloc_cellseg (SCHEME_A));
4702
4703 s_return (S_T);
4704 4774
4705 case OP_OBLIST: /* oblist */ 4775 case OP_OBLIST: /* oblist */
4706 s_return (oblist_all_symbols (SCHEME_A)); 4776 s_return (oblist_all_symbols (SCHEME_A));
4707 4777
4708#if USE_PORTS 4778#if USE_PORTS
… …
4778 s_return (p == NIL ? S_F : p); 4848 s_return (p == NIL ? S_F : p);
4779 } 4849 }
4780 4850
4781 case OP_GET_OUTSTRING: /* get-output-string */ 4851 case OP_GET_OUTSTRING: /* get-output-string */
4782 { 4852 {
4783 port *p; 4853 port *p = port (a);
4784 4854
4785 if ((p = a->object.port)->kind & port_string) 4855 if (p->kind & port_string)
4786 { 4856 {
4787 off_t size; 4857 off_t size;
4788 char *str; 4858 char *str;
4789 4859
4790 size = p->rep.string.curr - p->rep.string.start + 1; 4860 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4825 } 4895 }
4826 4896
4827 if (USE_ERROR_CHECKING) abort (); 4897 if (USE_ERROR_CHECKING) abort ();
4828} 4898}
4829 4899
4830static int 4900/* reading */
4901ecb_cold static int
4831opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4902opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4832{ 4903{
4833 pointer args = SCHEME_V->args; 4904 pointer args = SCHEME_V->args;
4834 pointer x; 4905 pointer x;
4835 4906
… …
4895 int res; 4966 int res;
4896 4967
4897 if (is_pair (args)) 4968 if (is_pair (args))
4898 p = car (args); 4969 p = car (args);
4899 4970
4900 res = p->object.port->kind & port_string; 4971 res = port (p)->kind & port_string;
4901 4972
4902 s_retbool (res); 4973 s_retbool (res);
4903 } 4974 }
4904 4975
4905 case OP_SET_INPORT: /* set-input-port */ 4976 case OP_SET_INPORT: /* set-input-port */
… …
5177 } 5248 }
5178 5249
5179 if (USE_ERROR_CHECKING) abort (); 5250 if (USE_ERROR_CHECKING) abort ();
5180} 5251}
5181 5252
5182static int 5253/* list ops */
5254ecb_hot static int
5183opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5255opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5184{ 5256{
5185 pointer args = SCHEME_V->args; 5257 pointer args = SCHEME_V->args;
5186 pointer a = car (args); 5258 pointer a = car (args);
5187 pointer x, y; 5259 pointer x, y;
… …
5245 5317
5246/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5318/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5247typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5319typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5248 5320
5249typedef int (*test_predicate)(pointer); 5321typedef int (*test_predicate)(pointer);
5250static int 5322
5323ecb_hot static int
5251tst_any (pointer p) 5324tst_any (pointer p)
5252{ 5325{
5253 return 1; 5326 return 1;
5254} 5327}
5255 5328
5256static int 5329ecb_hot static int
5257tst_inonneg (pointer p) 5330tst_inonneg (pointer p)
5258{ 5331{
5259 return is_integer (p) && ivalue_unchecked (p) >= 0; 5332 return is_integer (p) && ivalue_unchecked (p) >= 0;
5260} 5333}
5261 5334
5262static int 5335ecb_hot static int
5263tst_is_list (SCHEME_P_ pointer p) 5336tst_is_list (SCHEME_P_ pointer p)
5264{ 5337{
5265 return p == NIL || is_pair (p); 5338 return p == NIL || is_pair (p);
5266} 5339}
5267 5340
… …
5310#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5383#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5311#include "opdefines.h" 5384#include "opdefines.h"
5312#undef OP_DEF 5385#undef OP_DEF
5313; 5386;
5314 5387
5315static const char * 5388ecb_cold static const char *
5316opname (int idx) 5389opname (int idx)
5317{ 5390{
5318 const char *name = opnames; 5391 const char *name = opnames;
5319 5392
5320 /* should do this at compile time, but would require external program, right? */ 5393 /* should do this at compile time, but would require external program, right? */
… …
5322 name += strlen (name) + 1; 5395 name += strlen (name) + 1;
5323 5396
5324 return *name ? name : "ILLEGAL"; 5397 return *name ? name : "ILLEGAL";
5325} 5398}
5326 5399
5327static const char * 5400ecb_cold static const char *
5328procname (pointer x) 5401procname (pointer x)
5329{ 5402{
5330 return opname (procnum (x)); 5403 return opname (procnum (x));
5331} 5404}
5332 5405
… …
5352#undef OP_DEF 5425#undef OP_DEF
5353 {0} 5426 {0}
5354}; 5427};
5355 5428
5356/* kernel of this interpreter */ 5429/* kernel of this interpreter */
5357static void ecb_hot 5430ecb_hot static void
5358Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5431Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5359{ 5432{
5360 SCHEME_V->op = op; 5433 SCHEME_V->op = op;
5361 5434
5362 for (;;) 5435 for (;;)
… …
5445 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5518 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5446 return; 5519 return;
5447 5520
5448 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5521 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5449 { 5522 {
5450 xwrstr ("No memory!\n"); 5523 putstr (SCHEME_A_ "No memory!\n");
5451 return; 5524 return;
5452 } 5525 }
5453 } 5526 }
5454} 5527}
5455 5528
5456/* ========== Initialization of internal keywords ========== */ 5529/* ========== Initialization of internal keywords ========== */
5457 5530
5458static void 5531ecb_cold static void
5459assign_syntax (SCHEME_P_ const char *name) 5532assign_syntax (SCHEME_P_ const char *name)
5460{ 5533{
5461 pointer x = oblist_add_by_name (SCHEME_A_ name); 5534 pointer x = oblist_add_by_name (SCHEME_A_ name);
5462 set_typeflag (x, typeflag (x) | T_SYNTAX); 5535 set_typeflag (x, typeflag (x) | T_SYNTAX);
5463} 5536}
5464 5537
5465static void 5538ecb_cold static void
5466assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5539assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5467{ 5540{
5468 pointer x = mk_symbol (SCHEME_A_ name); 5541 pointer x = mk_symbol (SCHEME_A_ name);
5469 pointer y = mk_proc (SCHEME_A_ op); 5542 pointer y = mk_proc (SCHEME_A_ op);
5470 new_slot_in_env (SCHEME_A_ x, y); 5543 new_slot_in_env (SCHEME_A_ x, y);
… …
5478 ivalue_unchecked (y) = op; 5551 ivalue_unchecked (y) = op;
5479 return y; 5552 return y;
5480} 5553}
5481 5554
5482/* Hard-coded for the given keywords. Remember to rewrite if more are added! */ 5555/* Hard-coded for the given keywords. Remember to rewrite if more are added! */
5483static int 5556ecb_hot static int
5484syntaxnum (pointer p) 5557syntaxnum (pointer p)
5485{ 5558{
5486 const char *s = strvalue (p); 5559 const char *s = strvalue (p);
5487 5560
5488 switch (strlength (p)) 5561 switch (strlength (p))
… …
5568ecb_cold int 5641ecb_cold int
5569scheme_init (SCHEME_P) 5642scheme_init (SCHEME_P)
5570{ 5643{
5571 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5644 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5572 pointer x; 5645 pointer x;
5646
5647 /* this memset is not strictly correct, as we assume (intcache)
5648 * that memset 0 will also set pointers to 0, but memset does
5649 * of course not guarantee that. screw such systems.
5650 */
5651 memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5573 5652
5574 num_set_fixnum (num_zero, 1); 5653 num_set_fixnum (num_zero, 1);
5575 num_set_ivalue (num_zero, 0); 5654 num_set_ivalue (num_zero, 0);
5576 num_set_fixnum (num_one, 1); 5655 num_set_fixnum (num_one, 1);
5577 num_set_ivalue (num_one, 1); 5656 num_set_ivalue (num_one, 1);
… …
5589 SCHEME_V->save_inport = NIL; 5668 SCHEME_V->save_inport = NIL;
5590 SCHEME_V->loadport = NIL; 5669 SCHEME_V->loadport = NIL;
5591 SCHEME_V->nesting = 0; 5670 SCHEME_V->nesting = 0;
5592 SCHEME_V->interactive_repl = 0; 5671 SCHEME_V->interactive_repl = 0;
5593 5672
5594 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5673 if (!alloc_cellseg (SCHEME_A))
5595 { 5674 {
5596#if USE_ERROR_CHECKING 5675#if USE_ERROR_CHECKING
5597 SCHEME_V->no_memory = 1; 5676 SCHEME_V->no_memory = 1;
5598 return 0; 5677 return 0;
5599#endif 5678#endif
… …
5667 5746
5668 return !SCHEME_V->no_memory; 5747 return !SCHEME_V->no_memory;
5669} 5748}
5670 5749
5671#if USE_PORTS 5750#if USE_PORTS
5672void 5751ecb_cold void
5673scheme_set_input_port_file (SCHEME_P_ int fin) 5752scheme_set_input_port_file (SCHEME_P_ int fin)
5674{ 5753{
5675 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 5754 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5676} 5755}
5677 5756
5678void 5757ecb_cold void
5679scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end) 5758scheme_set_input_port_string (SCHEME_P_ char *start, char *past_the_end)
5680{ 5759{
5681 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input); 5760 SCHEME_V->inport = port_from_string (SCHEME_A_ start, past_the_end, port_input);
5682} 5761}
5683 5762
5684void 5763ecb_cold void
5685scheme_set_output_port_file (SCHEME_P_ int fout) 5764scheme_set_output_port_file (SCHEME_P_ int fout)
5686{ 5765{
5687 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 5766 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5688} 5767}
5689 5768
5690void 5769ecb_cold void
5691scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end) 5770scheme_set_output_port_string (SCHEME_P_ char *start, char *past_the_end)
5692{ 5771{
5693 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output); 5772 SCHEME_V->outport = port_from_string (SCHEME_A_ start, past_the_end, port_output);
5694} 5773}
5695#endif 5774#endif
5696 5775
5697void 5776ecb_cold void
5698scheme_set_external_data (SCHEME_P_ void *p) 5777scheme_set_external_data (SCHEME_P_ void *p)
5699{ 5778{
5700 SCHEME_V->ext_data = p; 5779 SCHEME_V->ext_data = p;
5701} 5780}
5702 5781
… …
5750 } 5829 }
5751 } 5830 }
5752#endif 5831#endif
5753} 5832}
5754 5833
5755void 5834ecb_cold void
5756scheme_load_file (SCHEME_P_ int fin) 5835scheme_load_file (SCHEME_P_ int fin)
5757{ 5836{
5758 scheme_load_named_file (SCHEME_A_ fin, 0); 5837 scheme_load_named_file (SCHEME_A_ fin, 0);
5759} 5838}
5760 5839
5761void 5840ecb_cold void
5762scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 5841scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5763{ 5842{
5764 dump_stack_reset (SCHEME_A); 5843 dump_stack_reset (SCHEME_A);
5765 SCHEME_V->envir = SCHEME_V->global_env; 5844 SCHEME_V->envir = SCHEME_V->global_env;
5766 SCHEME_V->file_i = 0; 5845 SCHEME_V->file_i = 0;
… …
5793 5872
5794 if (SCHEME_V->retcode == 0) 5873 if (SCHEME_V->retcode == 0)
5795 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5874 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5796} 5875}
5797 5876
5798void 5877ecb_cold void
5799scheme_load_string (SCHEME_P_ const char *cmd) 5878scheme_load_string (SCHEME_P_ const char *cmd)
5800{ 5879{
5801 dump_stack_reset (SCHEME_A); 5880 dump_stack_reset (SCHEME_A);
5802 SCHEME_V->envir = SCHEME_V->global_env; 5881 SCHEME_V->envir = SCHEME_V->global_env;
5803 SCHEME_V->file_i = 0; 5882 SCHEME_V->file_i = 0;
… …
5817 5896
5818 if (SCHEME_V->retcode == 0) 5897 if (SCHEME_V->retcode == 0)
5819 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5898 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5820} 5899}
5821 5900
5822void 5901ecb_cold void
5823scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 5902scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5824{ 5903{
5825 pointer x; 5904 pointer x;
5826 5905
5827 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 5906 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5832 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 5911 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5833} 5912}
5834 5913
5835#if !STANDALONE 5914#if !STANDALONE
5836 5915
5837void 5916ecb_cold void
5838scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 5917scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5839{ 5918{
5840 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f)); 5919 scheme_define (SCHEME_A_ SCHEME_V->global_env, mk_symbol (SCHEME_A_ sr->name), mk_foreign_func (SCHEME_A_ sr->f));
5841} 5920}
5842 5921
5843void 5922ecb_cold void
5844scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 5923scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5845{ 5924{
5846 int i; 5925 int i;
5847 5926
5848 for (i = 0; i < count; i++) 5927 for (i = 0; i < count; i++)
5849 scheme_register_foreign_func (SCHEME_A_ list + i); 5928 scheme_register_foreign_func (SCHEME_A_ list + i);
5850} 5929}
5851 5930
5852pointer 5931ecb_cold pointer
5853scheme_apply0 (SCHEME_P_ const char *procname) 5932scheme_apply0 (SCHEME_P_ const char *procname)
5854{ 5933{
5855 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL)); 5934 return scheme_eval (SCHEME_A_ cons (mk_symbol (SCHEME_A_ procname), NIL));
5856} 5935}
5857 5936
5858void 5937ecb_cold void
5859save_from_C_call (SCHEME_P) 5938save_from_C_call (SCHEME_P)
5860{ 5939{
5861 pointer saved_data = cons (car (S_SINK), 5940 pointer saved_data = cons (car (S_SINK),
5862 cons (SCHEME_V->envir, 5941 cons (SCHEME_V->envir,
5863 SCHEME_V->dump)); 5942 SCHEME_V->dump));
… …
5867 /* Truncate the dump stack so TS will return here when done, not 5946 /* Truncate the dump stack so TS will return here when done, not
5868 directly resume pre-C-call operations. */ 5947 directly resume pre-C-call operations. */
5869 dump_stack_reset (SCHEME_A); 5948 dump_stack_reset (SCHEME_A);
5870} 5949}
5871 5950
5872void 5951ecb_cold void
5873restore_from_C_call (SCHEME_P) 5952restore_from_C_call (SCHEME_P)
5874{ 5953{
5875 set_car (S_SINK, caar (SCHEME_V->c_nest)); 5954 set_car (S_SINK, caar (SCHEME_V->c_nest));
5876 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 5955 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5877 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 5956 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5878 /* Pop */ 5957 /* Pop */
5879 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 5958 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5880} 5959}
5881 5960
5882/* "func" and "args" are assumed to be already eval'ed. */ 5961/* "func" and "args" are assumed to be already eval'ed. */
5883pointer 5962ecb_cold pointer
5884scheme_call (SCHEME_P_ pointer func, pointer args) 5963scheme_call (SCHEME_P_ pointer func, pointer args)
5885{ 5964{
5886 int old_repl = SCHEME_V->interactive_repl; 5965 int old_repl = SCHEME_V->interactive_repl;
5887 5966
5888 SCHEME_V->interactive_repl = 0; 5967 SCHEME_V->interactive_repl = 0;
… …
5895 SCHEME_V->interactive_repl = old_repl; 5974 SCHEME_V->interactive_repl = old_repl;
5896 restore_from_C_call (SCHEME_A); 5975 restore_from_C_call (SCHEME_A);
5897 return SCHEME_V->value; 5976 return SCHEME_V->value;
5898} 5977}
5899 5978
5900pointer 5979ecb_cold pointer
5901scheme_eval (SCHEME_P_ pointer obj) 5980scheme_eval (SCHEME_P_ pointer obj)
5902{ 5981{
5903 int old_repl = SCHEME_V->interactive_repl; 5982 int old_repl = SCHEME_V->interactive_repl;
5904 5983
5905 SCHEME_V->interactive_repl = 0; 5984 SCHEME_V->interactive_repl = 0;
… …
5917 5996
5918/* ========== Main ========== */ 5997/* ========== Main ========== */
5919 5998
5920#if STANDALONE 5999#if STANDALONE
5921 6000
5922int 6001ecb_cold int
5923main (int argc, char **argv) 6002main (int argc, char **argv)
5924{ 6003{
5925# if USE_MULTIPLICITY 6004# if USE_MULTIPLICITY
5926 scheme ssc; 6005 scheme ssc;
5927 scheme *const SCHEME_V = &ssc; 6006 scheme *const SCHEME_V = &ssc;
… …
5933 int isfile = 1; 6012 int isfile = 1;
5934 system ("ps v $PPID");//D 6013 system ("ps v $PPID");//D
5935 6014
5936 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6015 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5937 { 6016 {
5938 xwrstr ("Usage: tinyscheme -?\n"); 6017 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5939 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6018 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5940 xwrstr ("followed by\n"); 6019 putstr (SCHEME_A_ "followed by\n");
5941 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6020 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5942 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6021 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5943 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6022 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5944 xwrstr ("Use - as filename for stdin.\n"); 6023 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5945 return 1; 6024 return 1;
5946 } 6025 }
5947 6026
5948 if (!scheme_init (SCHEME_A)) 6027 if (!scheme_init (SCHEME_A))
5949 { 6028 {
5950 xwrstr ("Could not initialize!\n"); 6029 putstr (SCHEME_A_ "Could not initialize!\n");
5951 return 2; 6030 return 2;
5952 } 6031 }
5953 6032
5954# if USE_PORTS 6033# if USE_PORTS
5955 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6034 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6000 fin = open (file_name, O_RDONLY); 6079 fin = open (file_name, O_RDONLY);
6001#endif 6080#endif
6002 6081
6003 if (isfile && fin < 0) 6082 if (isfile && fin < 0)
6004 { 6083 {
6005 xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n"); 6084 putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6006 } 6085 }
6007 else 6086 else
6008 { 6087 {
6009 if (isfile) 6088 if (isfile)
6010 scheme_load_named_file (SCHEME_A_ fin, file_name); 6089 scheme_load_named_file (SCHEME_A_ fin, file_name);
… …
6014#if USE_PORTS 6093#if USE_PORTS
6015 if (!isfile || fin != STDIN_FILENO) 6094 if (!isfile || fin != STDIN_FILENO)
6016 { 6095 {
6017 if (SCHEME_V->retcode != 0) 6096 if (SCHEME_V->retcode != 0)
6018 { 6097 {
6019 xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n"); 6098 putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6020 } 6099 }
6021 6100
6022 if (isfile) 6101 if (isfile)
6023 close (fin); 6102 close (fin);
6024 } 6103 }

Diff Legend

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