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.23 by root, Fri Nov 27 02:06:36 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>
… …
34 38
35#include <sys/types.h> 39#include <sys/types.h>
36#include <sys/stat.h> 40#include <sys/stat.h>
37#include <fcntl.h> 41#include <fcntl.h>
38 42
43#if !USE_ERROR_CHECKING
44# define NDEBUG
45#endif
46
47#include <assert.h>
48#include <stdlib.h>
39#include <string.h> 49#include <string.h>
40#include <stdlib.h>
41 50
42#include <limits.h> 51#include <limits.h>
43#include <inttypes.h> 52#include <inttypes.h>
44#include <float.h> 53#include <float.h>
45//#include <ctype.h> 54//#include <ctype.h>
55
56#if '1' != '0' + 1 \
57 || '2' != '0' + 2 || '3' != '0' + 3 || '4' != '0' + 4 || '5' != '0' + 5 \
58 || '6' != '0' + 6 || '7' != '0' + 7 || '8' != '0' + 8 || '9' != '0' + 9 \
59 || 'b' != 'a' + 1 || 'c' != 'a' + 2 || 'd' != 'a' + 3 || 'e' != 'a' + 4 \
60 || 'f' != 'a' + 5
61# error "execution character set digits not consecutive"
62#endif
46 63
47enum { 64enum {
48 TOK_EOF, 65 TOK_EOF,
49 TOK_LPAREN, 66 TOK_LPAREN,
50 TOK_RPAREN, 67 TOK_RPAREN,
51 TOK_DOT, 68 TOK_DOT,
52 TOK_ATOM, 69 TOK_ATOM,
70 TOK_DOTATOM, /* atom name starting with '.' */
71 TOK_STRATOM, /* atom name enclosed in | */
53 TOK_QUOTE, 72 TOK_QUOTE,
54 TOK_DQUOTE, 73 TOK_DQUOTE,
55 TOK_BQUOTE, 74 TOK_BQUOTE,
56 TOK_COMMA, 75 TOK_COMMA,
57 TOK_ATMARK, 76 TOK_ATMARK,
… …
59 TOK_SHARP_CONST, 78 TOK_SHARP_CONST,
60 TOK_VEC 79 TOK_VEC
61}; 80};
62 81
63#define BACKQUOTE '`' 82#define BACKQUOTE '`'
64#define DELIMITERS "()\";\f\t\v\n\r " 83#define WHITESPACE " \t\r\n\v\f"
84#define DELIMITERS "()\";" WHITESPACE
65 85
66#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 86#define NIL POINTER (&SCHEME_V->xNIL)
67#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 87#define S_T POINTER (&SCHEME_V->xT)
68#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 88#define S_F POINTER (&SCHEME_V->xF)
69#define S_SINK (&SCHEME_V->xsink) 89#define S_SINK POINTER (&SCHEME_V->xsink)
70#define S_EOF (&SCHEME_V->xEOF_OBJ) 90#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
71 91
72#if !USE_MULTIPLICITY 92#if !USE_MULTIPLICITY
73static scheme sc; 93static scheme sc;
74#endif 94#endif
75 95
76static void 96ecb_cold static void
77xbase (char *s, long n, int base) 97xbase (char *s, long n, int base)
78{ 98{
79 if (n < 0) 99 if (n < 0)
80 { 100 {
81 *s++ = '-'; 101 *s++ = '-';
… …
83 } 103 }
84 104
85 char *p = s; 105 char *p = s;
86 106
87 do { 107 do {
88 *p++ = '0' + n % base; 108 *p++ = "0123456789abcdef"[n % base];
89 n /= base; 109 n /= base;
90 } while (n); 110 } while (n);
91 111
92 *p-- = 0; 112 *p-- = 0;
93 113
… …
96 char x = *s; *s = *p; *p = x; 116 char x = *s; *s = *p; *p = x;
97 --p; ++s; 117 --p; ++s;
98 } 118 }
99} 119}
100 120
101static void 121ecb_cold static void
102xnum (char *s, long n) 122xnum (char *s, long n)
103{ 123{
104 xbase (s, n, 10); 124 xbase (s, n, 10);
105} 125}
106 126
107static void 127ecb_cold static void
108xwrstr (const char *s) 128putnum (SCHEME_P_ long n)
109{
110 write (1, s, strlen (s));
111}
112
113static void
114xwrnum (long n)
115{ 129{
116 char buf[64]; 130 char buf[64];
117 131
118 xnum (buf, n); 132 xnum (buf, n);
119 xwrstr (buf); 133 putstr (SCHEME_A_ buf);
120} 134}
121 135
122static char 136ecb_cold static char
123xtoupper (char c) 137xtoupper (char c)
124{ 138{
125 if (c >= 'a' && c <= 'z') 139 if (c >= 'a' && c <= 'z')
126 c -= 'a' - 'A'; 140 c -= 'a' - 'A';
127 141
128 return c; 142 return c;
129} 143}
130 144
131static char 145ecb_cold static char
132xtolower (char c) 146xtolower (char c)
133{ 147{
134 if (c >= 'A' && c <= 'Z') 148 if (c >= 'A' && c <= 'Z')
135 c += 'a' - 'A'; 149 c += 'a' - 'A';
136 150
137 return c; 151 return c;
138} 152}
139 153
140static int 154ecb_cold static int
141xisdigit (char c) 155xisdigit (char c)
142{ 156{
143 return c >= '0' && c <= '9'; 157 return c >= '0' && c <= '9';
144} 158}
145 159
146#define toupper(c) xtoupper (c) 160#define toupper(c) xtoupper (c)
147#define tolower(c) xtolower (c) 161#define tolower(c) xtolower (c)
148#define isdigit(c) xisdigit (c) 162#define isdigit(c) xisdigit (c)
149 163
150#if USE_IGNORECASE 164#if USE_IGNORECASE
151static const char * 165ecb_cold static const char *
152xstrlwr (char *s) 166xstrlwr (char *s)
153{ 167{
154 const char *p = s; 168 const char *p = s;
155 169
156 while (*s) 170 while (*s)
… …
176 190
177#ifndef InitFile 191#ifndef InitFile
178# define InitFile "init.scm" 192# define InitFile "init.scm"
179#endif 193#endif
180 194
181#ifndef FIRST_CELLSEGS
182# define FIRST_CELLSEGS 3
183#endif
184
185enum scheme_types 195enum scheme_types
186{ 196{
197 T_INTEGER,
198 T_CHARACTER,
187 T_FREE, 199 T_REAL,
188 T_STRING, 200 T_STRING,
189 T_NUMBER,
190 T_SYMBOL, 201 T_SYMBOL,
191 T_PROC, 202 T_PROC,
192 T_PAIR, 203 T_PAIR, /* also used for free cells */
193 T_CLOSURE, 204 T_CLOSURE,
205 T_MACRO,
194 T_CONTINUATION, 206 T_CONTINUATION,
195 T_FOREIGN, 207 T_FOREIGN,
196 T_CHARACTER,
197 T_PORT, 208 T_PORT,
198 T_VECTOR, 209 T_VECTOR,
199 T_MACRO,
200 T_PROMISE, 210 T_PROMISE,
201 T_ENVIRONMENT, 211 T_ENVIRONMENT,
202 /* one more... */ 212 /* one more... */
203 T_NUM_SYSTEM_TYPES 213 T_NUM_SYSTEM_TYPES
204}; 214};
… …
207#define T_SYNTAX 0x0010 217#define T_SYNTAX 0x0010
208#define T_IMMUTABLE 0x0020 218#define T_IMMUTABLE 0x0020
209#define T_ATOM 0x0040 /* only for gc */ 219#define T_ATOM 0x0040 /* only for gc */
210#define T_MARK 0x0080 /* only for gc */ 220#define T_MARK 0x0080 /* only for gc */
211 221
222/* num, for generic arithmetic */
223struct num
224{
225 IVALUE ivalue;
226#if USE_REAL
227 RVALUE rvalue;
228 char is_fixnum;
229#endif
230};
231
232#if USE_REAL
233# define num_is_fixnum(n) (n).is_fixnum
234# define num_set_fixnum(n,f) (n).is_fixnum = (f)
235# define num_ivalue(n) (n).ivalue
236# define num_rvalue(n) (n).rvalue
237# define num_set_ivalue(n,i) (n).rvalue = (n).ivalue = (i)
238# define num_set_rvalue(n,r) (n).rvalue = (r)
239#else
240# define num_is_fixnum(n) 1
241# define num_set_fixnum(n,f) 0
242# define num_ivalue(n) (n).ivalue
243# define num_rvalue(n) (n).ivalue
244# define num_set_ivalue(n,i) (n).ivalue = (i)
245# define num_set_rvalue(n,r) (n).ivalue = (r)
246#endif
247
212enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 248enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
213 249
214static num num_op (enum num_op op, num a, num b); 250static num num_op (enum num_op op, num a, num b);
215static num num_intdiv (num a, num b); 251static num num_intdiv (num a, num b);
216static num num_rem (num a, num b); 252static num num_rem (num a, num b);
217static num num_mod (num a, num b); 253static num num_mod (num a, num b);
218 254
219#if USE_MATH
220static double round_per_R5RS (double x);
221#endif
222static int is_zero_rvalue (RVALUE x); 255static int is_zero_rvalue (RVALUE x);
223
224ecb_inline int
225num_is_integer (pointer p)
226{
227 return num_is_fixnum (p->object.number);
228}
229 256
230static num num_zero; 257static num num_zero;
231static num num_one; 258static num num_one;
232 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
233/* macros for cell operations */ 264/* macros for cell operations */
234#define typeflag(p) ((p)->flag + 0) 265#define typeflag(p) (CELL(p)->flag + 0)
235#define set_typeflag(p,v) ((p)->flag = (v)) 266#define set_typeflag(p,v) (CELL(p)->flag = (v))
236#define type(p) (typeflag (p) & T_MASKTYPE) 267#define type(p) (typeflag (p) & T_MASKTYPE)
237 268
238INTERFACE int 269INTERFACE int
239is_string (pointer p) 270is_string (pointer p)
240{ 271{
241 return type (p) == T_STRING; 272 return type (p) == T_STRING;
242} 273}
243 274
244#define strvalue(p) ((p)->object.string.svalue) 275#define strvalue(p) (CELL(p)->object.string.svalue)
245#define strlength(p) ((p)->object.string.length) 276#define strlength(p) (CELL(p)->object.string.length)
246
247INTERFACE int is_list (SCHEME_P_ pointer p);
248 277
249INTERFACE int 278INTERFACE int
250is_vector (pointer p) 279is_vector (pointer p)
251{ 280{
252 return type (p) == T_VECTOR; 281 return type (p) == T_VECTOR;
253} 282}
254 283
255#define vecvalue(p) ((p)->object.vector.vvalue) 284#define vecvalue(p) (CELL(p)->object.vector.vvalue)
256#define veclength(p) ((p)->object.vector.length) 285#define veclength(p) (CELL(p)->object.vector.length)
257INTERFACE void fill_vector (pointer vec, pointer obj); 286INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
258INTERFACE uint32_t vector_length (pointer vec);
259INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 287INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
260INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 288INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
261 289
262INTERFACE uint32_t 290INTERFACE int
263vector_length (pointer vec) 291is_integer (pointer p)
264{ 292{
265 return vec->object.vector.length; 293 return type (p) == T_INTEGER;
294}
295
296/* not the same as in scheme, where integers are (correctly :) reals */
297INTERFACE int
298is_real (pointer p)
299{
300 return type (p) == T_REAL;
266} 301}
267 302
268INTERFACE int 303INTERFACE int
269is_number (pointer p) 304is_number (pointer p)
270{ 305{
271 return type (p) == T_NUMBER; 306 return is_integer (p) || is_real (p);
272}
273
274INTERFACE int
275is_integer (pointer p)
276{
277 if (!is_number (p))
278 return 0;
279
280 if (num_is_integer (p) || ivalue (p) == rvalue (p))
281 return 1;
282
283 return 0;
284}
285
286INTERFACE int
287is_real (pointer p)
288{
289 return is_number (p) && !num_is_fixnum (p->object.number);
290} 307}
291 308
292INTERFACE int 309INTERFACE int
293is_character (pointer p) 310is_character (pointer p)
294{ 311{
… …
299string_value (pointer p) 316string_value (pointer p)
300{ 317{
301 return strvalue (p); 318 return strvalue (p);
302} 319}
303 320
304ecb_inline num
305nvalue (pointer p)
306{
307 return (p)->object.number;
308}
309
310static IVALUE
311num_get_ivalue (const num n)
312{
313 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
314}
315
316static RVALUE
317num_get_rvalue (const num n)
318{
319 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
320}
321
322INTERFACE IVALUE
323ivalue (pointer p)
324{
325 return num_get_ivalue (p->object.number);
326}
327
328INTERFACE RVALUE
329rvalue (pointer p)
330{
331 return num_get_rvalue (p->object.number);
332}
333
334#define ivalue_unchecked(p) ((p)->object.number.value.ivalue) 321#define ivalue_unchecked(p) CELL(p)->object.ivalue
322#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
323
335#if USE_REAL 324#if USE_REAL
336# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 325#define rvalue_unchecked(p) CELL(p)->object.rvalue
337# define set_num_integer(p) (p)->object.number.is_fixnum=1; 326#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
338# define set_num_real(p) (p)->object.number.is_fixnum=0;
339#else 327#else
340# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 328#define rvalue_unchecked(p) CELL(p)->object.ivalue
341# define set_num_integer(p) 0 329#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
342# define set_num_real(p) 0
343#endif 330#endif
344 331
345INTERFACE long 332INTERFACE long
346charvalue (pointer p) 333charvalue (pointer p)
347{ 334{
348 return ivalue_unchecked (p); 335 return ivalue_unchecked (p);
349} 336}
350 337
338#define port(p) CELL(p)->object.port
339#define set_port(p,v) port(p) = (v)
351INTERFACE int 340INTERFACE int
352is_port (pointer p) 341is_port (pointer p)
353{ 342{
354 return type (p) == T_PORT; 343 return type (p) == T_PORT;
355} 344}
356 345
357INTERFACE int 346INTERFACE int
358is_inport (pointer p) 347is_inport (pointer p)
359{ 348{
360 return is_port (p) && p->object.port->kind & port_input; 349 return is_port (p) && port (p)->kind & port_input;
361} 350}
362 351
363INTERFACE int 352INTERFACE int
364is_outport (pointer p) 353is_outport (pointer p)
365{ 354{
366 return is_port (p) && p->object.port->kind & port_output; 355 return is_port (p) && port (p)->kind & port_output;
367} 356}
368 357
369INTERFACE int 358INTERFACE int
370is_pair (pointer p) 359is_pair (pointer p)
371{ 360{
372 return type (p) == T_PAIR; 361 return type (p) == T_PAIR;
373} 362}
374 363
375#define car(p) ((p)->object.cons.car + 0) 364#define car(p) (POINTER (CELL(p)->object.cons.car))
376#define cdr(p) ((p)->object.cons.cdr + 0) 365#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
377 366
378static pointer caar (pointer p) { return car (car (p)); } 367static pointer caar (pointer p) { return car (car (p)); }
379static pointer cadr (pointer p) { return car (cdr (p)); } 368static pointer cadr (pointer p) { return car (cdr (p)); }
380static pointer cdar (pointer p) { return cdr (car (p)); } 369static pointer cdar (pointer p) { return cdr (car (p)); }
381static pointer cddr (pointer p) { return cdr (cdr (p)); } 370static pointer cddr (pointer p) { return cdr (cdr (p)); }
… …
385static pointer cdaar (pointer p) { return cdr (car (car (p))); } 374static pointer cdaar (pointer p) { return cdr (car (car (p))); }
386 375
387INTERFACE void 376INTERFACE void
388set_car (pointer p, pointer q) 377set_car (pointer p, pointer q)
389{ 378{
390 p->object.cons.car = q; 379 CELL(p)->object.cons.car = CELL (q);
391} 380}
392 381
393INTERFACE void 382INTERFACE void
394set_cdr (pointer p, pointer q) 383set_cdr (pointer p, pointer q)
395{ 384{
396 p->object.cons.cdr = q; 385 CELL(p)->object.cons.cdr = CELL (q);
397} 386}
398 387
399INTERFACE pointer 388INTERFACE pointer
400pair_car (pointer p) 389pair_car (pointer p)
401{ 390{
… …
415} 404}
416 405
417INTERFACE char * 406INTERFACE char *
418symname (pointer p) 407symname (pointer p)
419{ 408{
420 return strvalue (car (p)); 409 return strvalue (p);
421} 410}
422 411
423#if USE_PLIST 412#if USE_PLIST
413#error plists are broken because symbols are no longer pairs
414#define symprop(p) cdr(p)
424SCHEME_EXPORT int 415SCHEME_EXPORT int
425hasprop (pointer p) 416hasprop (pointer p)
426{ 417{
427 return typeflag (p) & T_SYMBOL; 418 return typeflag (p) & T_SYMBOL;
428} 419}
429
430# define symprop(p) cdr(p)
431#endif 420#endif
432 421
433INTERFACE int 422INTERFACE int
434is_syntax (pointer p) 423is_syntax (pointer p)
435{ 424{
… …
449} 438}
450 439
451INTERFACE char * 440INTERFACE char *
452syntaxname (pointer p) 441syntaxname (pointer p)
453{ 442{
454 return strvalue (car (p)); 443 return strvalue (p);
455} 444}
456 445
457#define procnum(p) ivalue (p) 446#define procnum(p) ivalue_unchecked (p)
458static const char *procname (pointer x); 447static const char *procname (pointer x);
459 448
460INTERFACE int 449INTERFACE int
461is_closure (pointer p) 450is_closure (pointer p)
462{ 451{
… …
523setimmutable (pointer p) 512setimmutable (pointer p)
524{ 513{
525#if USE_ERROR_CHECKING 514#if USE_ERROR_CHECKING
526 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 515 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
527#endif 516#endif
517}
518
519/* Result is:
520 proper list: length
521 circular list: -1
522 not even a pair: -2
523 dotted list: -2 minus length before dot
524*/
525ecb_hot INTERFACE int
526list_length (SCHEME_P_ pointer a)
527{
528 int i = 0;
529 pointer slow, fast;
530
531 slow = fast = a;
532
533 while (1)
534 {
535 if (fast == NIL)
536 return i;
537
538 if (!is_pair (fast))
539 return -2 - i;
540
541 fast = cdr (fast);
542 ++i;
543
544 if (fast == NIL)
545 return i;
546
547 if (!is_pair (fast))
548 return -2 - i;
549
550 ++i;
551 fast = cdr (fast);
552
553 /* Safe because we would have already returned if `fast'
554 encountered a non-pair. */
555 slow = cdr (slow);
556
557 if (fast == slow)
558 {
559 /* the fast pointer has looped back around and caught up
560 with the slow pointer, hence the structure is circular,
561 not of finite length, and therefore not a list */
562 return -1;
563 }
564 }
565}
566
567INTERFACE int
568is_list (SCHEME_P_ pointer a)
569{
570 return list_length (SCHEME_A_ a) >= 0;
528} 571}
529 572
530#if USE_CHAR_CLASSIFIERS 573#if USE_CHAR_CLASSIFIERS
531ecb_inline int 574ecb_inline int
532Cisalpha (int c) 575Cisalpha (int c)
… …
593 "gs", 636 "gs",
594 "rs", 637 "rs",
595 "us" 638 "us"
596}; 639};
597 640
598static int 641ecb_cold static int
599is_ascii_name (const char *name, int *pc) 642is_ascii_name (const char *name, int *pc)
600{ 643{
601 int i; 644 int i;
602 645
603 for (i = 0; i < 32; i++) 646 for (i = 0; i < 32; i++)
… …
621#endif 664#endif
622 665
623static int file_push (SCHEME_P_ const char *fname); 666static int file_push (SCHEME_P_ const char *fname);
624static void file_pop (SCHEME_P); 667static void file_pop (SCHEME_P);
625static int file_interactive (SCHEME_P); 668static int file_interactive (SCHEME_P);
626ecb_inline int is_one_of (char *s, int c); 669ecb_inline int is_one_of (const char *s, int c);
627static int alloc_cellseg (SCHEME_P_ int n); 670static int alloc_cellseg (SCHEME_P);
628ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 671ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
629static void finalize_cell (SCHEME_P_ pointer a); 672static void finalize_cell (SCHEME_P_ pointer a);
630static int count_consecutive_cells (pointer x, int needed); 673static int count_consecutive_cells (pointer x, int needed);
631static 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);
632static pointer mk_number (SCHEME_P_ const num n); 675static pointer mk_number (SCHEME_P_ const num n);
… …
648static void mark (pointer a); 691static void mark (pointer a);
649static void gc (SCHEME_P_ pointer a, pointer b); 692static void gc (SCHEME_P_ pointer a, pointer b);
650static int basic_inchar (port *pt); 693static int basic_inchar (port *pt);
651static int inchar (SCHEME_P); 694static int inchar (SCHEME_P);
652static void backchar (SCHEME_P_ int c); 695static void backchar (SCHEME_P_ int c);
653static char *readstr_upto (SCHEME_P_ char *delim); 696static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
654static pointer readstrexp (SCHEME_P); 697static pointer readstrexp (SCHEME_P_ char delim);
655ecb_inline int skipspace (SCHEME_P); 698ecb_inline int skipspace (SCHEME_P);
656static int token (SCHEME_P); 699static int token (SCHEME_P);
657static void printslashstring (SCHEME_P_ char *s, int len); 700static void printslashstring (SCHEME_P_ char *s, int len);
658static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen); 701static void atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen);
659static void printatom (SCHEME_P_ pointer l, int f); 702static void printatom (SCHEME_P_ pointer l, int f);
… …
676static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 719static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
677static void assign_syntax (SCHEME_P_ const char *name); 720static void assign_syntax (SCHEME_P_ const char *name);
678static int syntaxnum (pointer p); 721static int syntaxnum (pointer p);
679static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 722static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
680 723
724static IVALUE
725ivalue (pointer x)
726{
727 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
728}
729
730static RVALUE
731rvalue (pointer x)
732{
733 return is_integer (x) ? ivalue_unchecked (x) : rvalue_unchecked (x);
734}
735
736INTERFACE num
737nvalue (pointer x)
738{
739 num n;
740
741 num_set_fixnum (n, is_integer (x));
742
743 if (num_is_fixnum (n))
744 num_set_ivalue (n, ivalue_unchecked (x));
745 else
746 num_set_rvalue (n, rvalue_unchecked (x));
747
748 return n;
749}
750
681static num 751static num
682num_op (enum num_op op, num a, num b) 752num_op (enum num_op op, num a, num b)
683{ 753{
684 num ret; 754 num ret;
685 755
686 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 756 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
687 757
688 if (num_is_fixnum (ret)) 758 if (num_is_fixnum (ret))
689 { 759 {
690 IVALUE av = num_get_ivalue (a);
691 IVALUE bv = num_get_ivalue (b);
692
693 switch (op) 760 switch (op)
694 { 761 {
695 case NUM_ADD: av += bv; break; 762 case NUM_ADD: a.ivalue += b.ivalue; break;
696 case NUM_SUB: av -= bv; break; 763 case NUM_SUB: a.ivalue -= b.ivalue; break;
697 case NUM_MUL: av *= bv; break; 764 case NUM_MUL: a.ivalue *= b.ivalue; break;
698 case NUM_INTDIV: av /= bv; break; 765 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
699 } 766 }
700 767
701 num_set_ivalue (ret, av); 768 num_set_ivalue (ret, a.ivalue);
702 } 769 }
770#if USE_REAL
703 else 771 else
704 { 772 {
705 RVALUE av = num_get_rvalue (a);
706 RVALUE bv = num_get_rvalue (b);
707
708 switch (op) 773 switch (op)
709 { 774 {
710 case NUM_ADD: av += bv; break; 775 case NUM_ADD: a.rvalue += b.rvalue; break;
711 case NUM_SUB: av -= bv; break; 776 case NUM_SUB: a.rvalue -= b.rvalue; break;
712 case NUM_MUL: av *= bv; break; 777 case NUM_MUL: a.rvalue *= b.rvalue; break;
713 case NUM_INTDIV: av /= bv; break; 778 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
714 } 779 }
715 780
716 num_set_rvalue (ret, av); 781 num_set_rvalue (ret, a.rvalue);
717 } 782 }
783#endif
718 784
719 return ret; 785 return ret;
720} 786}
721 787
722static num 788static num
723num_div (num a, num b) 789num_div (num a, num b)
724{ 790{
725 num ret; 791 num ret;
726 792
727 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_get_ivalue (a) % num_get_ivalue (b) == 0); 793 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b) && num_ivalue (a) % num_ivalue (b) == 0);
728 794
729 if (num_is_fixnum (ret)) 795 if (num_is_fixnum (ret))
730 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 796 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
731 else 797 else
732 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 798 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
733 799
734 return ret; 800 return ret;
735} 801}
736 802
737static num 803static num
… …
739{ 805{
740 num ret; 806 num ret;
741 long e1, e2, res; 807 long e1, e2, res;
742 808
743 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 809 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
744 e1 = num_get_ivalue (a); 810 e1 = num_ivalue (a);
745 e2 = num_get_ivalue (b); 811 e2 = num_ivalue (b);
746 res = e1 % e2; 812 res = e1 % e2;
747 813
748 /* remainder should have same sign as second operand */ 814 /* remainder should have same sign as second operand */
749 if (res > 0) 815 if (res > 0)
750 { 816 {
… …
766{ 832{
767 num ret; 833 num ret;
768 long e1, e2, res; 834 long e1, e2, res;
769 835
770 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b)); 836 num_set_fixnum (ret, num_is_fixnum (a) && num_is_fixnum (b));
771 e1 = num_get_ivalue (a); 837 e1 = num_ivalue (a);
772 e2 = num_get_ivalue (b); 838 e2 = num_ivalue (b);
773 res = e1 % e2; 839 res = e1 % e2;
774 840
775 /* modulo should have same sign as second operand */ 841 /* modulo should have same sign as second operand */
776 if (res * e2 < 0) 842 if (res * e2 < 0)
777 res += e2; 843 res += e2;
… …
787 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 853 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
788 int ret; 854 int ret;
789 855
790 if (is_fixnum) 856 if (is_fixnum)
791 { 857 {
792 IVALUE av = num_get_ivalue (a); 858 IVALUE av = num_ivalue (a);
793 IVALUE bv = num_get_ivalue (b); 859 IVALUE bv = num_ivalue (b);
794 860
795 ret = av == bv ? 0 : av < bv ? -1 : +1; 861 ret = av == bv ? 0 : av < bv ? -1 : +1;
796 } 862 }
797 else 863 else
798 { 864 {
799 RVALUE av = num_get_rvalue (a); 865 RVALUE av = num_rvalue (a);
800 RVALUE bv = num_get_rvalue (b); 866 RVALUE bv = num_rvalue (b);
801 867
802 ret = av == bv ? 0 : av < bv ? -1 : +1; 868 ret = av == bv ? 0 : av < bv ? -1 : +1;
803 } 869 }
804 870
805 return ret; 871 return ret;
806} 872}
807
808#if USE_MATH
809
810/* Round to nearest. Round to even if midway */
811static double
812round_per_R5RS (double x)
813{
814 double fl = floor (x);
815 double ce = ceil (x);
816 double dfl = x - fl;
817 double dce = ce - x;
818
819 if (dfl > dce)
820 return ce;
821 else if (dfl < dce)
822 return fl;
823 else
824 {
825 if (fmod (fl, 2) == 0) /* I imagine this holds */
826 return fl;
827 else
828 return ce;
829 }
830}
831#endif
832 873
833static int 874static int
834is_zero_rvalue (RVALUE x) 875is_zero_rvalue (RVALUE x)
835{ 876{
836 return x == 0; 877 return x == 0;
… …
842#endif 883#endif
843#endif 884#endif
844} 885}
845 886
846/* allocate new cell segment */ 887/* allocate new cell segment */
847static int 888ecb_cold static int
848alloc_cellseg (SCHEME_P_ int n) 889alloc_cellseg (SCHEME_P)
849{ 890{
850 pointer newp; 891 struct cell *newp;
851 pointer last; 892 struct cell *last;
852 pointer p; 893 struct cell *p;
853 char *cp; 894 char *cp;
854 long i; 895 long i;
855 int k; 896 int k;
856 897
857 static int segsize = CELL_SEGSIZE >> 1; 898 static int segsize = CELL_SEGSIZE >> 1;
858 segsize <<= 1; 899 segsize <<= 1;
859 900
860 for (k = 0; k < n; k++)
861 {
862 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
863 return k;
864
865 cp = malloc (segsize * sizeof (struct cell)); 901 cp = malloc (segsize * sizeof (struct cell));
866 902
867 if (!cp && USE_ERROR_CHECKING) 903 if (!cp && USE_ERROR_CHECKING)
868 return k; 904 return k;
869 905
870 i = ++SCHEME_V->last_cell_seg; 906 i = ++SCHEME_V->last_cell_seg;
871 SCHEME_V->alloc_seg[i] = cp; 907 SCHEME_V->alloc_seg[i] = cp;
872 908
873 /* insert new segment in address order */ 909 newp = (struct cell *)cp;
874 newp = (pointer)cp;
875 SCHEME_V->cell_seg[i] = newp; 910 SCHEME_V->cell_seg[i] = newp;
876 SCHEME_V->cell_segsize[i] = segsize; 911 SCHEME_V->cell_segsize[i] = segsize;
877
878 //TODO: insert, not swap
879 while (i > 0 && SCHEME_V->cell_seg[i - 1] > SCHEME_V->cell_seg[i])
880 {
881 p = SCHEME_V->cell_seg[i];
882 SCHEME_V->cell_seg[i] = SCHEME_V->cell_seg[i - 1];
883 SCHEME_V->cell_seg[i - 1] = p;
884
885 k = SCHEME_V->cell_segsize[i];
886 SCHEME_V->cell_segsize[i] = SCHEME_V->cell_segsize[i - 1];
887 SCHEME_V->cell_segsize[i - 1] = k;
888
889 --i;
890 }
891
892 SCHEME_V->fcells += segsize; 912 SCHEME_V->fcells += segsize;
893 last = newp + segsize - 1; 913 last = newp + segsize - 1;
894 914
895 for (p = newp; p <= last; p++) 915 for (p = newp; p <= last; p++)
896 { 916 {
917 pointer cp = POINTER (p);
897 set_typeflag (p, T_FREE); 918 set_typeflag (cp, T_PAIR);
898 set_car (p, NIL); 919 set_car (cp, NIL);
899 set_cdr (p, p + 1); 920 set_cdr (cp, POINTER (p + 1));
900 } 921 }
901 922
902 /* insert new cells in address order on free list */
903 if (SCHEME_V->free_cell == NIL || p < SCHEME_V->free_cell)
904 {
905 set_cdr (last, SCHEME_V->free_cell); 923 set_cdr (POINTER (last), SCHEME_V->free_cell);
906 SCHEME_V->free_cell = newp; 924 SCHEME_V->free_cell = POINTER (newp);
907 }
908 else
909 {
910 p = SCHEME_V->free_cell;
911 925
912 while (cdr (p) != NIL && newp > cdr (p))
913 p = cdr (p);
914
915 set_cdr (last, cdr (p));
916 set_cdr (p, newp);
917 }
918 }
919
920 return n; 926 return 1;
921} 927}
922 928
923/* get new cell. parameter a, b is marked by gc. */ 929/* get new cell. parameter a, b is marked by gc. */
924ecb_inline pointer 930ecb_inline pointer
925get_cell_x (SCHEME_P_ pointer a, pointer b) 931get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
929 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 935 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
930 return S_SINK; 936 return S_SINK;
931 937
932 if (SCHEME_V->free_cell == NIL) 938 if (SCHEME_V->free_cell == NIL)
933 { 939 {
934 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;
935 941
936 gc (SCHEME_A_ a, b); 942 gc (SCHEME_A_ a, b);
937 943
938 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)
939 { 945 {
940 /* 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 */
941 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 947 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
942 { 948 {
943#if USE_ERROR_CHECKING 949#if USE_ERROR_CHECKING
944 SCHEME_V->no_memory = 1; 950 SCHEME_V->no_memory = 1;
945 return S_SINK; 951 return S_SINK;
946#endif 952#endif
… …
958 } 964 }
959} 965}
960 966
961/* To retain recent allocs before interpreter knows about them - 967/* To retain recent allocs before interpreter knows about them -
962 Tehom */ 968 Tehom */
963 969ecb_hot static void
964static void
965push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 970push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
966{ 971{
967 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 972 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
968 973
969 set_typeflag (holder, T_PAIR); 974 set_typeflag (holder, T_PAIR);
… …
971 set_car (holder, recent); 976 set_car (holder, recent);
972 set_cdr (holder, car (S_SINK)); 977 set_cdr (holder, car (S_SINK));
973 set_car (S_SINK, holder); 978 set_car (S_SINK, holder);
974} 979}
975 980
976static pointer 981ecb_hot static pointer
977get_cell (SCHEME_P_ pointer a, pointer b) 982get_cell (SCHEME_P_ pointer a, pointer b)
978{ 983{
979 pointer cell = get_cell_x (SCHEME_A_ a, b); 984 pointer cell = get_cell_x (SCHEME_A_ a, b);
980 985
981 /* 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
… …
990} 995}
991 996
992static pointer 997static pointer
993get_vector_object (SCHEME_P_ uint32_t len, pointer init) 998get_vector_object (SCHEME_P_ uint32_t len, pointer init)
994{ 999{
995 pointer v = get_cell_x (SCHEME_A_ 0, 0); 1000 pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
996 pointer *e = malloc (len * sizeof (pointer)); 1001 pointer *e = malloc (len * sizeof (pointer));
997 1002
998 if (!e && USE_ERROR_CHECKING) 1003 if (!e && USE_ERROR_CHECKING)
999 return S_SINK; 1004 return S_SINK;
1000 1005
1001 /* Record it as a vector so that gc understands it. */ 1006 /* Record it as a vector so that gc understands it. */
1002 set_typeflag (v, T_VECTOR | T_ATOM); 1007 set_typeflag (v, T_VECTOR | T_ATOM);
1003 1008
1004 v->object.vector.vvalue = e; 1009 CELL(v)->object.vector.vvalue = e;
1005 v->object.vector.length = len; 1010 CELL(v)->object.vector.length = len;
1006 fill_vector (v, init); 1011 fill_vector (v, 0, init);
1007 push_recent_alloc (SCHEME_A_ v, NIL); 1012 push_recent_alloc (SCHEME_A_ v, NIL);
1008 1013
1009 return v; 1014 return v;
1010} 1015}
1011 1016
… …
1019static void 1024static void
1020check_cell_alloced (pointer p, int expect_alloced) 1025check_cell_alloced (pointer p, int expect_alloced)
1021{ 1026{
1022 /* 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. */
1023 if (typeflag (p) & !expect_alloced) 1028 if (typeflag (p) & !expect_alloced)
1024 xwrstr ("Cell is already allocated!\n"); 1029 putstr (SCHEME_A_ "Cell is already allocated!\n");
1025 1030
1026 if (!(typeflag (p)) & expect_alloced) 1031 if (!(typeflag (p)) & expect_alloced)
1027 xwrstr ("Cell is not allocated!\n"); 1032 putstr (SCHEME_A_ "Cell is not allocated!\n");
1028} 1033}
1029 1034
1030static void 1035static void
1031check_range_alloced (pointer p, int n, int expect_alloced) 1036check_range_alloced (pointer p, int n, int expect_alloced)
1032{ 1037{
… …
1038#endif 1043#endif
1039 1044
1040/* Medium level cell allocation */ 1045/* Medium level cell allocation */
1041 1046
1042/* get new cons cell */ 1047/* get new cons cell */
1043pointer 1048ecb_hot pointer
1044xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1049xcons (SCHEME_P_ pointer a, pointer b, int immutable)
1045{ 1050{
1046 pointer x = get_cell (SCHEME_A_ a, b); 1051 pointer x = get_cell (SCHEME_A_ a, b);
1047 1052
1048 set_typeflag (x, T_PAIR); 1053 set_typeflag (x, T_PAIR);
… …
1054 set_cdr (x, b); 1059 set_cdr (x, b);
1055 1060
1056 return x; 1061 return x;
1057} 1062}
1058 1063
1064ecb_cold static pointer
1065generate_symbol (SCHEME_P_ const char *name)
1066{
1067 pointer x = mk_string (SCHEME_A_ name);
1068 setimmutable (x);
1069 set_typeflag (x, T_SYMBOL | T_ATOM);
1070 return x;
1071}
1072
1059/* ========== oblist implementation ========== */ 1073/* ========== oblist implementation ========== */
1060 1074
1061#ifndef USE_OBJECT_LIST 1075#ifndef USE_OBJECT_LIST
1062 1076
1077static int
1063static int hash_fn (const char *key, int table_size); 1078hash_fn (const char *key, int table_size)
1079{
1080 const unsigned char *p = key;
1081 uint32_t hash = 2166136261;
1064 1082
1083 while (*p)
1084 hash = (hash ^ *p++) * 16777619;
1085
1086 return hash % table_size;
1087}
1088
1065static pointer 1089ecb_cold static pointer
1066oblist_initial_value (SCHEME_P) 1090oblist_initial_value (SCHEME_P)
1067{ 1091{
1068 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1092 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1069} 1093}
1070 1094
1071/* returns the new symbol */ 1095/* returns the new symbol */
1072static pointer 1096ecb_cold static pointer
1073oblist_add_by_name (SCHEME_P_ const char *name) 1097oblist_add_by_name (SCHEME_P_ const char *name)
1074{ 1098{
1075 int location; 1099 pointer x = generate_symbol (SCHEME_A_ name);
1076
1077 pointer x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1078 set_typeflag (x, T_SYMBOL);
1079 setimmutable (car (x));
1080
1081 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1100 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1082 set_vector_elem (SCHEME_V->oblist, location, immutable_cons (x, vector_elem (SCHEME_V->oblist, location))); 1101 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1083 return x; 1102 return x;
1084} 1103}
1085 1104
1086ecb_inline pointer 1105ecb_cold static pointer
1087oblist_find_by_name (SCHEME_P_ const char *name) 1106oblist_find_by_name (SCHEME_P_ const char *name)
1088{ 1107{
1089 int location; 1108 int location;
1090 pointer x; 1109 pointer x;
1091 char *s; 1110 char *s;
1092 1111
1093 location = hash_fn (name, veclength (SCHEME_V->oblist)); 1112 location = hash_fn (name, veclength (SCHEME_V->oblist));
1094 1113
1095 for (x = vector_elem (SCHEME_V->oblist, location); x != NIL; x = cdr (x)) 1114 for (x = vector_get (SCHEME_V->oblist, location); x != NIL; x = cdr (x))
1096 { 1115 {
1097 s = symname (car (x)); 1116 s = symname (car (x));
1098 1117
1099 /* case-insensitive, per R5RS section 2 */ 1118 /* case-insensitive, per R5RS section 2 */
1100 if (stricmp (name, s) == 0) 1119 if (stricmp (name, s) == 0)
… …
1102 } 1121 }
1103 1122
1104 return NIL; 1123 return NIL;
1105} 1124}
1106 1125
1107static pointer 1126ecb_cold static pointer
1108oblist_all_symbols (SCHEME_P) 1127oblist_all_symbols (SCHEME_P)
1109{ 1128{
1110 int i; 1129 int i;
1111 pointer x; 1130 pointer x;
1112 pointer ob_list = NIL; 1131 pointer ob_list = NIL;
1113 1132
1114 for (i = 0; i < veclength (SCHEME_V->oblist); i++) 1133 for (i = 0; i < veclength (SCHEME_V->oblist); i++)
1115 for (x = vector_elem (SCHEME_V->oblist, i); x != NIL; x = cdr (x)) 1134 for (x = vector_get (SCHEME_V->oblist, i); x != NIL; x = cdr (x))
1116 ob_list = cons (x, ob_list); 1135 ob_list = cons (x, ob_list);
1117 1136
1118 return ob_list; 1137 return ob_list;
1119} 1138}
1120 1139
1121#else 1140#else
1122 1141
1123static pointer 1142ecb_cold static pointer
1124oblist_initial_value (SCHEME_P) 1143oblist_initial_value (SCHEME_P)
1125{ 1144{
1126 return NIL; 1145 return NIL;
1127} 1146}
1128 1147
1129ecb_inline pointer 1148ecb_cold static pointer
1130oblist_find_by_name (SCHEME_P_ const char *name) 1149oblist_find_by_name (SCHEME_P_ const char *name)
1131{ 1150{
1132 pointer x; 1151 pointer x;
1133 char *s; 1152 char *s;
1134 1153
… …
1143 1162
1144 return NIL; 1163 return NIL;
1145} 1164}
1146 1165
1147/* returns the new symbol */ 1166/* returns the new symbol */
1148static pointer 1167ecb_cold static pointer
1149oblist_add_by_name (SCHEME_P_ const char *name) 1168oblist_add_by_name (SCHEME_P_ const char *name)
1150{ 1169{
1151 pointer x; 1170 pointer x = generate_symbol (SCHEME_A_ name);
1152
1153 x = immutable_cons (mk_string (SCHEME_A_ name), NIL);
1154 set_typeflag (x, T_SYMBOL);
1155 setimmutable (car (x));
1156 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1171 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1157 return x; 1172 return x;
1158} 1173}
1159 1174
1160static pointer 1175ecb_cold static pointer
1161oblist_all_symbols (SCHEME_P) 1176oblist_all_symbols (SCHEME_P)
1162{ 1177{
1163 return SCHEME_V->oblist; 1178 return SCHEME_V->oblist;
1164} 1179}
1165 1180
1166#endif 1181#endif
1167 1182
1168#if USE_PORTS 1183#if USE_PORTS
1169static pointer 1184ecb_cold static pointer
1170mk_port (SCHEME_P_ port *p) 1185mk_port (SCHEME_P_ port *p)
1171{ 1186{
1172 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1187 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1173 1188
1174 set_typeflag (x, T_PORT | T_ATOM); 1189 set_typeflag (x, T_PORT | T_ATOM);
1175 x->object.port = p; 1190 set_port (x, p);
1176 1191
1177 return x; 1192 return x;
1178} 1193}
1179#endif 1194#endif
1180 1195
1181pointer 1196ecb_cold pointer
1182mk_foreign_func (SCHEME_P_ foreign_func f) 1197mk_foreign_func (SCHEME_P_ foreign_func f)
1183{ 1198{
1184 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1199 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1185 1200
1186 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1201 set_typeflag (x, T_FOREIGN | T_ATOM);
1187 x->object.ff = f; 1202 CELL(x)->object.ff = f;
1188 1203
1189 return x; 1204 return x;
1190} 1205}
1191 1206
1192INTERFACE pointer 1207INTERFACE pointer
1193mk_character (SCHEME_P_ int c) 1208mk_character (SCHEME_P_ int c)
1194{ 1209{
1195 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1210 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1196 1211
1197 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1212 set_typeflag (x, T_CHARACTER | T_ATOM);
1198 ivalue_unchecked (x) = c & 0xff; 1213 set_ivalue (x, c & 0xff);
1199 set_num_integer (x); 1214
1200 return x; 1215 return x;
1201} 1216}
1202 1217
1203/* get number atom (integer) */ 1218/* get number atom (integer) */
1204INTERFACE pointer 1219INTERFACE pointer
1205mk_integer (SCHEME_P_ long num) 1220mk_integer (SCHEME_P_ long n)
1206{ 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 {
1207 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1232 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1208 1233
1209 set_typeflag (x, (T_NUMBER | T_ATOM)); 1234 set_typeflag (x, T_INTEGER | T_ATOM);
1210 ivalue_unchecked (x) = num; 1235 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1211 set_num_integer (x); 1236 set_ivalue (x, n);
1237
1238 *pp = x;
1239 }
1240
1212 return x; 1241 return *pp;
1213} 1242}
1214 1243
1215INTERFACE pointer 1244INTERFACE pointer
1216mk_real (SCHEME_P_ RVALUE n) 1245mk_real (SCHEME_P_ RVALUE n)
1217{ 1246{
1247#if USE_REAL
1218 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1248 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1219 1249
1220 set_typeflag (x, (T_NUMBER | T_ATOM)); 1250 set_typeflag (x, T_REAL | T_ATOM);
1221 rvalue_unchecked (x) = n; 1251 set_rvalue (x, n);
1222 set_num_real (x); 1252
1223 return x; 1253 return x;
1254#else
1255 return mk_integer (SCHEME_A_ n);
1256#endif
1224} 1257}
1225 1258
1226static pointer 1259static pointer
1227mk_number (SCHEME_P_ const num n) 1260mk_number (SCHEME_P_ const num n)
1228{ 1261{
1262#if USE_REAL
1229 if (num_is_fixnum (n)) 1263 return num_is_fixnum (n)
1264 ? mk_integer (SCHEME_A_ num_ivalue (n))
1265 : mk_real (SCHEME_A_ num_rvalue (n));
1266#else
1230 return mk_integer (SCHEME_A_ num_get_ivalue (n)); 1267 return mk_integer (SCHEME_A_ num_ivalue (n));
1231 else 1268#endif
1232 return mk_real (SCHEME_A_ num_get_rvalue (n));
1233} 1269}
1234 1270
1235/* allocate name to string area */ 1271/* allocate name to string area */
1236static char * 1272static char *
1237store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill) 1273store_string (SCHEME_P_ uint32_t len_str, const char *str, char fill)
… …
1243 SCHEME_V->no_memory = 1; 1279 SCHEME_V->no_memory = 1;
1244 return SCHEME_V->strbuff; 1280 return SCHEME_V->strbuff;
1245 } 1281 }
1246 1282
1247 if (str) 1283 if (str)
1248 { 1284 memcpy (q, str , len_str); /* caller must ensure that *str has length len_str */
1249 int l = strlen (str);
1250
1251 if (l > len_str)
1252 l = len_str;
1253
1254 memcpy (q, str, l);
1255 q[l] = 0;
1256 }
1257 else 1285 else
1258 {
1259 memset (q, fill, len_str); 1286 memset (q, fill, len_str);
1287
1260 q[len_str] = 0; 1288 q[len_str] = 0;
1261 }
1262 1289
1263 return q; 1290 return q;
1264} 1291}
1265 1292
1266INTERFACE pointer 1293INTERFACE pointer
… …
1280 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1307 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1281 1308
1282 set_typeflag (x, T_STRING | T_ATOM); 1309 set_typeflag (x, T_STRING | T_ATOM);
1283 strvalue (x) = store_string (SCHEME_A_ len, str, 0); 1310 strvalue (x) = store_string (SCHEME_A_ len, str, 0);
1284 strlength (x) = len; 1311 strlength (x) = len;
1312
1285 return x; 1313 return x;
1286} 1314}
1287 1315
1288INTERFACE pointer 1316INTERFACE pointer
1289mk_string (SCHEME_P_ const char *str) 1317mk_string (SCHEME_P_ const char *str)
… …
1296{ 1324{
1297 return get_vector_object (SCHEME_A_ len, NIL); 1325 return get_vector_object (SCHEME_A_ len, NIL);
1298} 1326}
1299 1327
1300INTERFACE void 1328INTERFACE void
1301fill_vector (pointer vec, pointer obj) 1329fill_vector (pointer vec, uint32_t start, pointer obj)
1302{ 1330{
1303 int i; 1331 int i;
1304 1332
1305 for (i = 0; i < vec->object.vector.length; i++) 1333 for (i = start; i < veclength (vec); i++)
1306 vecvalue (vec)[i] = obj; 1334 vecvalue (vec)[i] = obj;
1307} 1335}
1308 1336
1337INTERFACE void
1338vector_resize (pointer vec, uint32_t newsize, pointer fill)
1339{
1340 uint32_t oldsize = veclength (vec);
1341 vecvalue (vec) = realloc (vecvalue (vec), newsize * sizeof (pointer));
1342 veclength (vec) = newsize;
1343 fill_vector (vec, oldsize, fill);
1344}
1345
1309INTERFACE pointer 1346INTERFACE pointer
1310vector_elem (pointer vec, uint32_t ielem) 1347vector_get (pointer vec, uint32_t ielem)
1311{ 1348{
1312 return vecvalue(vec)[ielem]; 1349 return vecvalue(vec)[ielem];
1313} 1350}
1314 1351
1315INTERFACE void 1352INTERFACE void
1316set_vector_elem (pointer vec, uint32_t ielem, pointer a) 1353vector_set (pointer vec, uint32_t ielem, pointer a)
1317{ 1354{
1318 vecvalue(vec)[ielem] = a; 1355 vecvalue(vec)[ielem] = a;
1319} 1356}
1320 1357
1321/* get new symbol */ 1358/* get new symbol */
… …
1329 x = oblist_add_by_name (SCHEME_A_ name); 1366 x = oblist_add_by_name (SCHEME_A_ name);
1330 1367
1331 return x; 1368 return x;
1332} 1369}
1333 1370
1334INTERFACE pointer 1371ecb_cold INTERFACE pointer
1335gensym (SCHEME_P) 1372gensym (SCHEME_P)
1336{ 1373{
1337 pointer x; 1374 pointer x;
1338
1339 for (; SCHEME_V->gensym_cnt < LONG_MAX; SCHEME_V->gensym_cnt++)
1340 {
1341 char name[40] = "gensym-"; 1375 char name[40] = "gensym-";
1342 xnum (name + 7, SCHEME_V->gensym_cnt); 1376 xnum (name + 7, ++SCHEME_V->gensym_cnt);
1343 1377
1344 /* first check oblist */ 1378 return generate_symbol (SCHEME_A_ name);
1345 x = oblist_find_by_name (SCHEME_A_ name); 1379}
1346 1380
1347 if (x == NIL) 1381static int
1348 { 1382is_gensym (SCHEME_P_ pointer x)
1349 x = oblist_add_by_name (SCHEME_A_ name); 1383{
1350 return x; 1384 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1351 }
1352 }
1353
1354 return NIL;
1355} 1385}
1356 1386
1357/* make symbol or number atom from string */ 1387/* make symbol or number atom from string */
1358static pointer 1388ecb_cold static pointer
1359mk_atom (SCHEME_P_ char *q) 1389mk_atom (SCHEME_P_ char *q)
1360{ 1390{
1361 char c, *p; 1391 char c, *p;
1362 int has_dec_point = 0; 1392 int has_dec_point = 0;
1363 int has_fp_exp = 0; 1393 int has_fp_exp = 0;
… …
1413 } 1443 }
1414 else if ((c == 'e') || (c == 'E')) 1444 else if ((c == 'e') || (c == 'E'))
1415 { 1445 {
1416 if (!has_fp_exp) 1446 if (!has_fp_exp)
1417 { 1447 {
1418 has_dec_point = 1; /* decimal point illegal 1448 has_dec_point = 1; /* decimal point illegal from now on */
1419 from now on */
1420 p++; 1449 p++;
1421 1450
1422 if ((*p == '-') || (*p == '+') || isdigit (*p)) 1451 if ((*p == '-') || (*p == '+') || isdigit (*p))
1423 continue; 1452 continue;
1424 } 1453 }
… …
1435 1464
1436 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1465 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1437} 1466}
1438 1467
1439/* make constant */ 1468/* make constant */
1440static pointer 1469ecb_cold static pointer
1441mk_sharp_const (SCHEME_P_ char *name) 1470mk_sharp_const (SCHEME_P_ char *name)
1442{ 1471{
1443 if (!strcmp (name, "t")) 1472 if (!strcmp (name, "t"))
1444 return S_T; 1473 return S_T;
1445 else if (!strcmp (name, "f")) 1474 else if (!strcmp (name, "f"))
1446 return S_F; 1475 return S_F;
1447 else if (*name == '\\') /* #\w (character) */ 1476 else if (*name == '\\') /* #\w (character) */
1448 { 1477 {
1449 int c; 1478 int c;
1450 1479
1480 // TODO: optimise
1451 if (stricmp (name + 1, "space") == 0) 1481 if (stricmp (name + 1, "space") == 0)
1452 c = ' '; 1482 c = ' ';
1453 else if (stricmp (name + 1, "newline") == 0) 1483 else if (stricmp (name + 1, "newline") == 0)
1454 c = '\n'; 1484 c = '\n';
1455 else if (stricmp (name + 1, "return") == 0) 1485 else if (stricmp (name + 1, "return") == 0)
1456 c = '\r'; 1486 c = '\r';
1457 else if (stricmp (name + 1, "tab") == 0) 1487 else if (stricmp (name + 1, "tab") == 0)
1458 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;
1459 else if (name[1] == 'x' && name[2] != 0) 1499 else if (name[1] == 'x' && name[2] != 0)
1460 { 1500 {
1461 long c1 = strtol (name + 2, 0, 16); 1501 long c1 = strtol (name + 2, 0, 16);
1462 1502
1463 if (0 <= c1 && c1 <= UCHAR_MAX) 1503 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1488 return NIL; 1528 return NIL;
1489 } 1529 }
1490} 1530}
1491 1531
1492/* ========== 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}
1493 1552
1494/*-- 1553/*--
1495 * 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,
1496 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1555 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1497 * for marking. 1556 * for marking.
1498 * 1557 *
1499 * The exception is vectors - vectors are currently marked recursively, 1558 * The exception is vectors - vectors are currently marked recursively,
1500 * 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
1501 * word of context in the vector 1560 * word of context in the vector
1502 */ 1561 */
1503static void 1562ecb_hot static void
1504mark (pointer a) 1563mark (pointer a)
1505{ 1564{
1506 pointer t, q, p; 1565 pointer t, q, p;
1507 1566
1508 t = 0; 1567 t = 0;
… …
1512 1571
1513 if (ecb_expect_false (is_vector (p))) 1572 if (ecb_expect_false (is_vector (p)))
1514 { 1573 {
1515 int i; 1574 int i;
1516 1575
1517 for (i = 0; i < p->object.vector.length; i++) 1576 for (i = 0; i < veclength (p); i++)
1518 mark (vecvalue (p)[i]); 1577 mark (vecvalue (p)[i]);
1519 } 1578 }
1520 1579
1521 if (is_atom (p)) 1580 if (is_atom (p))
1522 goto E6; 1581 goto E6;
… …
1565 p = q; 1624 p = q;
1566 goto E6; 1625 goto E6;
1567 } 1626 }
1568} 1627}
1569 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
1570/* garbage collection. parameter a, b is marked. */ 1671/* garbage collection. parameter a, b is marked. */
1571static void 1672ecb_cold static void
1572gc (SCHEME_P_ pointer a, pointer b) 1673gc (SCHEME_P_ pointer a, pointer b)
1573{ 1674{
1574 pointer p;
1575 int i; 1675 int i;
1576 1676
1577 if (SCHEME_V->gc_verbose) 1677 if (SCHEME_V->gc_verbose)
1578 putstr (SCHEME_A_ "gc..."); 1678 putstr (SCHEME_A_ "gc...");
1579 1679
… …
1595 /* Mark recent objects the interpreter doesn't know about yet. */ 1695 /* Mark recent objects the interpreter doesn't know about yet. */
1596 mark (car (S_SINK)); 1696 mark (car (S_SINK));
1597 /* Mark any older stuff above nested C calls */ 1697 /* Mark any older stuff above nested C calls */
1598 mark (SCHEME_V->c_nest); 1698 mark (SCHEME_V->c_nest);
1599 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
1600 /* mark variables a, b */ 1707 /* mark variables a, b */
1601 mark (a); 1708 mark (a);
1602 mark (b); 1709 mark (b);
1603 1710
1604 /* garbage collect */ 1711 /* garbage collect */
1605 clrmark (NIL); 1712 clrmark (NIL);
1606 SCHEME_V->fcells = 0; 1713 SCHEME_V->fcells = 0;
1607 SCHEME_V->free_cell = NIL; 1714 SCHEME_V->free_cell = NIL;
1608 1715
1609 /* free-list is kept sorted by address so as to maintain consecutive
1610 ranges, if possible, for use with vectors. Here we scan the cells
1611 (which are also kept sorted by address) downwards to build the
1612 free-list in sorted order.
1613 */
1614 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1615 {
1616 p = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1617
1618 while (--p >= SCHEME_V->cell_seg[i])
1619 {
1620 if (is_mark (p))
1621 clrmark (p);
1622 else
1623 {
1624 /* reclaim cell */
1625 if (typeflag (p) != T_FREE)
1626 {
1627 finalize_cell (SCHEME_A_ p);
1628 set_typeflag (p, T_FREE);
1629 set_car (p, NIL);
1630 }
1631
1632 ++SCHEME_V->fcells;
1633 set_cdr (p, SCHEME_V->free_cell);
1634 SCHEME_V->free_cell = p;
1635 }
1636 }
1637 }
1638
1639 if (SCHEME_V->gc_verbose) 1716 if (SCHEME_V->gc_verbose)
1640 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" cells were recovered.\n"); 1717 putstr (SCHEME_A_ "freeing...");
1641}
1642 1718
1643static void 1719 gc_free (SCHEME_A);
1644finalize_cell (SCHEME_P_ pointer a)
1645{
1646 /* TODO, fast bitmap check? */
1647 if (is_string (a))
1648 free (strvalue (a));
1649 else if (is_vector (a))
1650 free (vecvalue (a));
1651#if USE_PORTS
1652 else if (is_port (a))
1653 {
1654 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1655 port_close (SCHEME_A_ a, port_input | port_output);
1656
1657 free (a->object.port);
1658 }
1659#endif
1660} 1720}
1661 1721
1662/* ========== Routines for Reading ========== */ 1722/* ========== Routines for Reading ========== */
1663 1723
1664static int 1724ecb_cold static int
1665file_push (SCHEME_P_ const char *fname) 1725file_push (SCHEME_P_ const char *fname)
1666{ 1726{
1667#if USE_PORTS 1727#if USE_PORTS
1668 int fin; 1728 int fin;
1669 1729
… …
1678 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1738 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1679 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;
1680 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;
1681 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;
1682 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1742 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1683 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);
1684 1744
1685#if SHOW_ERROR_LINE 1745#if SHOW_ERROR_LINE
1686 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;
1687 1747
1688 if (fname) 1748 if (fname)
… …
1695#else 1755#else
1696 return 1; 1756 return 1;
1697#endif 1757#endif
1698} 1758}
1699 1759
1700static void 1760ecb_cold static void
1701file_pop (SCHEME_P) 1761file_pop (SCHEME_P)
1702{ 1762{
1703 if (SCHEME_V->file_i != 0) 1763 if (SCHEME_V->file_i != 0)
1704 { 1764 {
1705 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1765 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1706#if USE_PORTS 1766#if USE_PORTS
1707 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1767 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1708#endif 1768#endif
1709 SCHEME_V->file_i--; 1769 SCHEME_V->file_i--;
1710 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);
1711 } 1771 }
1712} 1772}
1713 1773
1714static int 1774ecb_cold static int
1715file_interactive (SCHEME_P) 1775file_interactive (SCHEME_P)
1716{ 1776{
1717#if USE_PORTS 1777#if USE_PORTS
1718 return SCHEME_V->file_i == 0 1778 return SCHEME_V->file_i == 0
1719 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1779 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1720 && (SCHEME_V->inport->object.port->kind & port_file); 1780 && (port (SCHEME_V->inport)->kind & port_file);
1721#else 1781#else
1722 return 0; 1782 return 0;
1723#endif 1783#endif
1724} 1784}
1725 1785
1726#if USE_PORTS 1786#if USE_PORTS
1727static port * 1787ecb_cold static port *
1728port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1788port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1729{ 1789{
1730 int fd; 1790 int fd;
1731 int flags; 1791 int flags;
1732 char *rw; 1792 char *rw;
… …
1755# endif 1815# endif
1756 1816
1757 return pt; 1817 return pt;
1758} 1818}
1759 1819
1760static pointer 1820ecb_cold static pointer
1761port_from_filename (SCHEME_P_ const char *fn, int prop) 1821port_from_filename (SCHEME_P_ const char *fn, int prop)
1762{ 1822{
1763 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1823 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1764 1824
1765 if (!pt && USE_ERROR_CHECKING) 1825 if (!pt && USE_ERROR_CHECKING)
1766 return NIL; 1826 return NIL;
1767 1827
1768 return mk_port (SCHEME_A_ pt); 1828 return mk_port (SCHEME_A_ pt);
1769} 1829}
1770 1830
1771static port * 1831ecb_cold static port *
1772port_rep_from_file (SCHEME_P_ int f, int prop) 1832port_rep_from_file (SCHEME_P_ int f, int prop)
1773{ 1833{
1774 port *pt = malloc (sizeof *pt); 1834 port *pt = malloc (sizeof *pt);
1775 1835
1776 if (!pt && USE_ERROR_CHECKING) 1836 if (!pt && USE_ERROR_CHECKING)
… …
1781 pt->rep.stdio.file = f; 1841 pt->rep.stdio.file = f;
1782 pt->rep.stdio.closeit = 0; 1842 pt->rep.stdio.closeit = 0;
1783 return pt; 1843 return pt;
1784} 1844}
1785 1845
1786static pointer 1846ecb_cold static pointer
1787port_from_file (SCHEME_P_ int f, int prop) 1847port_from_file (SCHEME_P_ int f, int prop)
1788{ 1848{
1789 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1849 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1790 1850
1791 if (!pt && USE_ERROR_CHECKING) 1851 if (!pt && USE_ERROR_CHECKING)
1792 return NIL; 1852 return NIL;
1793 1853
1794 return mk_port (SCHEME_A_ pt); 1854 return mk_port (SCHEME_A_ pt);
1795} 1855}
1796 1856
1797static port * 1857ecb_cold static port *
1798port_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)
1799{ 1859{
1800 port *pt = malloc (sizeof (port)); 1860 port *pt = malloc (sizeof (port));
1801 1861
1802 if (!pt && USE_ERROR_CHECKING) 1862 if (!pt && USE_ERROR_CHECKING)
… …
1808 pt->rep.string.curr = start; 1868 pt->rep.string.curr = start;
1809 pt->rep.string.past_the_end = past_the_end; 1869 pt->rep.string.past_the_end = past_the_end;
1810 return pt; 1870 return pt;
1811} 1871}
1812 1872
1813static pointer 1873ecb_cold static pointer
1814port_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)
1815{ 1875{
1816 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);
1817 1877
1818 if (!pt && USE_ERROR_CHECKING) 1878 if (!pt && USE_ERROR_CHECKING)
… …
1821 return mk_port (SCHEME_A_ pt); 1881 return mk_port (SCHEME_A_ pt);
1822} 1882}
1823 1883
1824# define BLOCK_SIZE 256 1884# define BLOCK_SIZE 256
1825 1885
1826static port * 1886ecb_cold static port *
1827port_rep_from_scratch (SCHEME_P) 1887port_rep_from_scratch (SCHEME_P)
1828{ 1888{
1829 char *start; 1889 char *start;
1830 port *pt = malloc (sizeof (port)); 1890 port *pt = malloc (sizeof (port));
1831 1891
… …
1845 pt->rep.string.curr = start; 1905 pt->rep.string.curr = start;
1846 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1906 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1847 return pt; 1907 return pt;
1848} 1908}
1849 1909
1850static pointer 1910ecb_cold static pointer
1851port_from_scratch (SCHEME_P) 1911port_from_scratch (SCHEME_P)
1852{ 1912{
1853 port *pt = port_rep_from_scratch (SCHEME_A); 1913 port *pt = port_rep_from_scratch (SCHEME_A);
1854 1914
1855 if (!pt && USE_ERROR_CHECKING) 1915 if (!pt && USE_ERROR_CHECKING)
1856 return NIL; 1916 return NIL;
1857 1917
1858 return mk_port (SCHEME_A_ pt); 1918 return mk_port (SCHEME_A_ pt);
1859} 1919}
1860 1920
1861static void 1921ecb_cold static void
1862port_close (SCHEME_P_ pointer p, int flag) 1922port_close (SCHEME_P_ pointer p, int flag)
1863{ 1923{
1864 port *pt = p->object.port; 1924 port *pt = port (p);
1865 1925
1866 pt->kind &= ~flag; 1926 pt->kind &= ~flag;
1867 1927
1868 if ((pt->kind & (port_input | port_output)) == 0) 1928 if ((pt->kind & (port_input | port_output)) == 0)
1869 { 1929 {
… …
1890/* get new character from input file */ 1950/* get new character from input file */
1891static int 1951static int
1892inchar (SCHEME_P) 1952inchar (SCHEME_P)
1893{ 1953{
1894 int c; 1954 int c;
1895 port *pt; 1955 port *pt = port (SCHEME_V->inport);
1896
1897 pt = SCHEME_V->inport->object.port;
1898 1956
1899 if (pt->kind & port_saw_EOF) 1957 if (pt->kind & port_saw_EOF)
1900 return EOF; 1958 return EOF;
1901 1959
1902 c = basic_inchar (pt); 1960 c = basic_inchar (pt);
… …
1969 port *pt; 2027 port *pt;
1970 2028
1971 if (c == EOF) 2029 if (c == EOF)
1972 return; 2030 return;
1973 2031
1974 pt = SCHEME_V->inport->object.port; 2032 pt = port (SCHEME_V->inport);
1975 pt->unget = c; 2033 pt->unget = c;
1976#else 2034#else
1977 if (c == EOF) 2035 if (c == EOF)
1978 return; 2036 return;
1979 2037
1980 ungot = c; 2038 ungot = c;
1981#endif 2039#endif
1982} 2040}
1983 2041
1984#if USE_PORTS 2042#if USE_PORTS
1985static int 2043ecb_cold static int
1986realloc_port_string (SCHEME_P_ port *p) 2044realloc_port_string (SCHEME_P_ port *p)
1987{ 2045{
1988 char *start = p->rep.string.start; 2046 char *start = p->rep.string.start;
1989 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;
1990 char *str = malloc (new_size); 2048 char *str = malloc (new_size);
… …
2003 else 2061 else
2004 return 0; 2062 return 0;
2005} 2063}
2006#endif 2064#endif
2007 2065
2008INTERFACE void 2066ecb_cold INTERFACE void
2009putstr (SCHEME_P_ const char *s) 2067putstr (SCHEME_P_ const char *s)
2010{ 2068{
2011#if USE_PORTS 2069#if USE_PORTS
2012 port *pt = SCHEME_V->outport->object.port; 2070 port *pt = port (SCHEME_V->outport);
2013 2071
2014 if (pt->kind & port_file) 2072 if (pt->kind & port_file)
2015 write (pt->rep.stdio.file, s, strlen (s)); 2073 write (pt->rep.stdio.file, s, strlen (s));
2016 else 2074 else
2017 for (; *s; s++) 2075 for (; *s; s++)
… …
2019 *pt->rep.string.curr++ = *s; 2077 *pt->rep.string.curr++ = *s;
2020 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))
2021 *pt->rep.string.curr++ = *s; 2079 *pt->rep.string.curr++ = *s;
2022 2080
2023#else 2081#else
2024 xwrstr (s); 2082 write (pt->rep.stdio.file, s, strlen (s));
2025#endif 2083#endif
2026} 2084}
2027 2085
2028static void 2086ecb_cold static void
2029putchars (SCHEME_P_ const char *s, int len) 2087putchars (SCHEME_P_ const char *s, int len)
2030{ 2088{
2031#if USE_PORTS 2089#if USE_PORTS
2032 port *pt = SCHEME_V->outport->object.port; 2090 port *pt = port (SCHEME_V->outport);
2033 2091
2034 if (pt->kind & port_file) 2092 if (pt->kind & port_file)
2035 write (pt->rep.stdio.file, s, len); 2093 write (pt->rep.stdio.file, s, len);
2036 else 2094 else
2037 { 2095 {
… …
2047#else 2105#else
2048 write (1, s, len); 2106 write (1, s, len);
2049#endif 2107#endif
2050} 2108}
2051 2109
2052INTERFACE void 2110ecb_cold INTERFACE void
2053putcharacter (SCHEME_P_ int c) 2111putcharacter (SCHEME_P_ int c)
2054{ 2112{
2055#if USE_PORTS 2113#if USE_PORTS
2056 port *pt = SCHEME_V->outport->object.port; 2114 port *pt = port (SCHEME_V->outport);
2057 2115
2058 if (pt->kind & port_file) 2116 if (pt->kind & port_file)
2059 { 2117 {
2060 char cc = c; 2118 char cc = c;
2061 write (pt->rep.stdio.file, &cc, 1); 2119 write (pt->rep.stdio.file, &cc, 1);
… …
2073 write (1, &c, 1); 2131 write (1, &c, 1);
2074#endif 2132#endif
2075} 2133}
2076 2134
2077/* read characters up to delimiter, but cater to character constants */ 2135/* read characters up to delimiter, but cater to character constants */
2078static char * 2136ecb_cold static char *
2079readstr_upto (SCHEME_P_ char *delim) 2137readstr_upto (SCHEME_P_ int skip, const char *delim)
2080{ 2138{
2081 char *p = SCHEME_V->strbuff; 2139 char *p = SCHEME_V->strbuff + skip;
2082 2140
2083 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))));
2084 2142
2085 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\') 2143 if (p == SCHEME_V->strbuff + 2 && p[-2] == '\\')
2086 *p = 0; 2144 *p = 0;
… …
2092 2150
2093 return SCHEME_V->strbuff; 2151 return SCHEME_V->strbuff;
2094} 2152}
2095 2153
2096/* read string expression "xxx...xxx" */ 2154/* read string expression "xxx...xxx" */
2097static pointer 2155ecb_cold static pointer
2098readstrexp (SCHEME_P) 2156readstrexp (SCHEME_P_ char delim)
2099{ 2157{
2100 char *p = SCHEME_V->strbuff; 2158 char *p = SCHEME_V->strbuff;
2101 int c; 2159 int c;
2102 int c1 = 0; 2160 int c1 = 0;
2103 enum
2104 { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok; 2161 enum { st_ok, st_bsl, st_x1, st_x2, st_oct1, st_oct2 } state = st_ok;
2105 2162
2106 for (;;) 2163 for (;;)
2107 { 2164 {
2108 c = inchar (SCHEME_A); 2165 c = inchar (SCHEME_A);
2109 2166
… …
2111 return S_F; 2168 return S_F;
2112 2169
2113 switch (state) 2170 switch (state)
2114 { 2171 {
2115 case st_ok: 2172 case st_ok:
2116 switch (c) 2173 if (ecb_expect_false (c == delim))
2117 {
2118 case '\\':
2119 state = st_bsl;
2120 break;
2121
2122 case '"':
2123 *p = 0;
2124 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff); 2174 return mk_counted_string (SCHEME_A_ SCHEME_V->strbuff, p - SCHEME_V->strbuff);
2125 2175
2126 default: 2176 if (ecb_expect_false (c == '\\'))
2177 state = st_bsl;
2178 else
2127 *p++ = c; 2179 *p++ = c;
2128 break;
2129 }
2130 2180
2131 break; 2181 break;
2132 2182
2133 case st_bsl: 2183 case st_bsl:
2134 switch (c) 2184 switch (c)
… …
2143 case '7': 2193 case '7':
2144 state = st_oct1; 2194 state = st_oct1;
2145 c1 = c - '0'; 2195 c1 = c - '0';
2146 break; 2196 break;
2147 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
2148 case 'x': 2206 case 'x':
2149 case 'X': 2207 case 'X':
2150 state = st_x1; 2208 state = st_x1;
2151 c1 = 0; 2209 c1 = 0;
2152 break; 2210 break;
2153 2211
2154 case 'n':
2155 *p++ = '\n';
2156 state = st_ok;
2157 break;
2158
2159 case 't':
2160 *p++ = '\t';
2161 state = st_ok;
2162 break;
2163
2164 case 'r':
2165 *p++ = '\r';
2166 state = st_ok;
2167 break;
2168
2169 case '"':
2170 *p++ = '"';
2171 state = st_ok;
2172 break;
2173
2174 default: 2212 default:
2175 *p++ = c; 2213 *p++ = c;
2176 state = st_ok; 2214 state = st_ok;
2177 break; 2215 break;
2178 } 2216 }
2179 2217
2180 break; 2218 break;
2181 2219
2182 case st_x1: 2220 case st_x1:
2183 case st_x2: 2221 case st_x2:
2184 c = toupper (c); 2222 c = tolower (c);
2185 2223
2186 if (c >= '0' && c <= 'F') 2224 if (c >= '0' && c <= '9')
2187 {
2188 if (c <= '9')
2189 c1 = (c1 << 4) + c - '0'; 2225 c1 = (c1 << 4) + c - '0';
2190 else 2226 else if (c >= 'a' && c <= 'f')
2191 c1 = (c1 << 4) + c - 'A' + 10; 2227 c1 = (c1 << 4) + c - 'a' + 10;
2192
2193 if (state == st_x1)
2194 state = st_x2;
2195 else
2196 {
2197 *p++ = c1;
2198 state = st_ok;
2199 }
2200 }
2201 else 2228 else
2202 return S_F; 2229 return S_F;
2230
2231 if (state == st_x1)
2232 state = st_x2;
2233 else
2234 {
2235 *p++ = c1;
2236 state = st_ok;
2237 }
2203 2238
2204 break; 2239 break;
2205 2240
2206 case st_oct1: 2241 case st_oct1:
2207 case st_oct2: 2242 case st_oct2:
… …
2211 backchar (SCHEME_A_ c); 2246 backchar (SCHEME_A_ c);
2212 state = st_ok; 2247 state = st_ok;
2213 } 2248 }
2214 else 2249 else
2215 { 2250 {
2216 if (state == st_oct2 && c1 >= 32) 2251 if (state == st_oct2 && c1 >= ' ')
2217 return S_F; 2252 return S_F;
2218 2253
2219 c1 = (c1 << 3) + (c - '0'); 2254 c1 = (c1 << 3) + (c - '0');
2220 2255
2221 if (state == st_oct1) 2256 if (state == st_oct1)
… …
2226 state = st_ok; 2261 state = st_ok;
2227 } 2262 }
2228 } 2263 }
2229 2264
2230 break; 2265 break;
2231
2232 } 2266 }
2233 } 2267 }
2234} 2268}
2235 2269
2236/* check c is in chars */ 2270/* check c is in chars */
2237ecb_inline int 2271ecb_cold int
2238is_one_of (char *s, int c) 2272is_one_of (const char *s, int c)
2239{ 2273{
2240 if (c == EOF)
2241 return 1;
2242
2243 return !!strchr (s, c); 2274 return c == EOF || !!strchr (s, c);
2244} 2275}
2245 2276
2246/* skip white characters */ 2277/* skip white characters */
2247ecb_inline int 2278ecb_cold int
2248skipspace (SCHEME_P) 2279skipspace (SCHEME_P)
2249{ 2280{
2250 int c, curr_line = 0; 2281 int c, curr_line = 0;
2251 2282
2252 do 2283 do
2253 { 2284 {
2254 c = inchar (SCHEME_A); 2285 c = inchar (SCHEME_A);
2286
2255#if SHOW_ERROR_LINE 2287#if SHOW_ERROR_LINE
2256 if (c == '\n') 2288 if (ecb_expect_false (c == '\n'))
2257 curr_line++; 2289 curr_line++;
2258#endif 2290#endif
2291
2292 if (ecb_expect_false (c == EOF))
2293 return c;
2259 } 2294 }
2260 while (c == ' ' || c == '\n' || c == '\r' || c == '\t'); 2295 while (is_one_of (WHITESPACE, c));
2261 2296
2262 /* record it */ 2297 /* record it */
2263#if SHOW_ERROR_LINE 2298#if SHOW_ERROR_LINE
2264 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)
2265 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;
2266#endif 2301#endif
2267 2302
2268 if (c != EOF)
2269 {
2270 backchar (SCHEME_A_ c); 2303 backchar (SCHEME_A_ c);
2271 return 1; 2304 return 1;
2272 }
2273 else
2274 return EOF;
2275} 2305}
2276 2306
2277/* get token */ 2307/* get token */
2278static int 2308ecb_cold static int
2279token (SCHEME_P) 2309token (SCHEME_P)
2280{ 2310{
2281 int c = skipspace (SCHEME_A); 2311 int c = skipspace (SCHEME_A);
2282 2312
2283 if (c == EOF) 2313 if (c == EOF)
… …
2295 return TOK_RPAREN; 2325 return TOK_RPAREN;
2296 2326
2297 case '.': 2327 case '.':
2298 c = inchar (SCHEME_A); 2328 c = inchar (SCHEME_A);
2299 2329
2300 if (is_one_of (" \n\t", c)) 2330 if (is_one_of (WHITESPACE, c))
2301 return TOK_DOT; 2331 return TOK_DOT;
2302 else 2332 else
2303 { 2333 {
2304 //TODO: ungetc twice in a row is not supported in C
2305 backchar (SCHEME_A_ c); 2334 backchar (SCHEME_A_ c);
2306 backchar (SCHEME_A_ '.');
2307 return TOK_ATOM; 2335 return TOK_DOTATOM;
2308 } 2336 }
2337
2338 case '|':
2339 return TOK_STRATOM;
2309 2340
2310 case '\'': 2341 case '\'':
2311 return TOK_QUOTE; 2342 return TOK_QUOTE;
2312 2343
2313 case ';': 2344 case ';':
… …
2380} 2411}
2381 2412
2382/* ========== Routines for Printing ========== */ 2413/* ========== Routines for Printing ========== */
2383#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2414#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2384 2415
2385static void 2416ecb_cold static void
2386printslashstring (SCHEME_P_ char *p, int len) 2417printslashstring (SCHEME_P_ char *p, int len)
2387{ 2418{
2388 int i; 2419 int i;
2389 unsigned char *s = (unsigned char *) p; 2420 unsigned char *s = (unsigned char *) p;
2390 2421
… …
2445 } 2476 }
2446 2477
2447 putcharacter (SCHEME_A_ '"'); 2478 putcharacter (SCHEME_A_ '"');
2448} 2479}
2449 2480
2450
2451/* print atoms */ 2481/* print atoms */
2452static void 2482ecb_cold static void
2453printatom (SCHEME_P_ pointer l, int f) 2483printatom (SCHEME_P_ pointer l, int f)
2454{ 2484{
2455 char *p; 2485 char *p;
2456 int len; 2486 int len;
2457 2487
2458 atom2str (SCHEME_A_ l, f, &p, &len); 2488 atom2str (SCHEME_A_ l, f, &p, &len);
2459 putchars (SCHEME_A_ p, len); 2489 putchars (SCHEME_A_ p, len);
2460} 2490}
2461 2491
2462
2463/* Uses internal buffer unless string pointer is already available */ 2492/* Uses internal buffer unless string pointer is already available */
2464static void 2493ecb_cold static void
2465atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2494atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2466{ 2495{
2467 char *p; 2496 char *p;
2468 2497
2469 if (l == NIL) 2498 if (l == NIL)
… …
2480 { 2509 {
2481 p = SCHEME_V->strbuff; 2510 p = SCHEME_V->strbuff;
2482 2511
2483 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */ 2512 if (f <= 1 || f == 10) /* f is the base for numbers if > 1 */
2484 { 2513 {
2485 if (num_is_integer (l)) 2514 if (is_integer (l))
2486 xnum (p, ivalue_unchecked (l)); 2515 xnum (p, ivalue_unchecked (l));
2487#if USE_REAL 2516#if USE_REAL
2488 else 2517 else
2489 { 2518 {
2490 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l)); 2519 snprintf (p, STRBUFFSIZE, "%.10g", rvalue_unchecked (l));
… …
2627#endif 2656#endif
2628 } 2657 }
2629 else if (is_continuation (l)) 2658 else if (is_continuation (l))
2630 p = "#<CONTINUATION>"; 2659 p = "#<CONTINUATION>";
2631 else 2660 else
2661 {
2662#if USE_PRINTF
2663 p = SCHEME_V->strbuff;
2664 snprintf (p, STRBUFFSIZE, "#<ERROR %x>", (int)typeflag (l));
2665#else
2632 p = "#<ERROR>"; 2666 p = "#<ERROR>";
2667#endif
2668 }
2633 2669
2634 *pp = p; 2670 *pp = p;
2635 *plen = strlen (p); 2671 *plen = strlen (p);
2636} 2672}
2637 2673
… …
2669 return car (d); 2705 return car (d);
2670 2706
2671 p = cons (car (d), cdr (d)); 2707 p = cons (car (d), cdr (d));
2672 q = p; 2708 q = p;
2673 2709
2674 while (cdr (cdr (p)) != NIL) 2710 while (cddr (p) != NIL)
2675 { 2711 {
2676 d = cons (car (p), cdr (p)); 2712 d = cons (car (p), cdr (p));
2677 2713
2678 if (cdr (cdr (p)) != NIL) 2714 if (cddr (p) != NIL)
2679 p = cdr (d); 2715 p = cdr (d);
2680 } 2716 }
2681 2717
2682 set_cdr (p, car (cdr (p))); 2718 set_cdr (p, cadr (p));
2683 return q; 2719 return q;
2684} 2720}
2685 2721
2686/* reverse list -- produce new list */ 2722/* reverse list -- produce new list */
2687static pointer 2723ecb_hot static pointer
2688reverse (SCHEME_P_ pointer a) 2724reverse (SCHEME_P_ pointer a)
2689{ 2725{
2690 /* a must be checked by gc */ 2726 /* a must be checked by gc */
2691 pointer p = NIL; 2727 pointer p = NIL;
2692 2728
… …
2695 2731
2696 return p; 2732 return p;
2697} 2733}
2698 2734
2699/* reverse list --- in-place */ 2735/* reverse list --- in-place */
2700static pointer 2736ecb_hot static pointer
2701reverse_in_place (SCHEME_P_ pointer term, pointer list) 2737reverse_in_place (SCHEME_P_ pointer term, pointer list)
2702{ 2738{
2703 pointer result = term; 2739 pointer result = term;
2704 pointer p = list; 2740 pointer p = list;
2705 2741
… …
2713 2749
2714 return result; 2750 return result;
2715} 2751}
2716 2752
2717/* append list -- produce new list (in reverse order) */ 2753/* append list -- produce new list (in reverse order) */
2718static pointer 2754ecb_hot static pointer
2719revappend (SCHEME_P_ pointer a, pointer b) 2755revappend (SCHEME_P_ pointer a, pointer b)
2720{ 2756{
2721 pointer result = a; 2757 pointer result = a;
2722 pointer p = b; 2758 pointer p = b;
2723 2759
… …
2732 2768
2733 return S_F; /* signal an error */ 2769 return S_F; /* signal an error */
2734} 2770}
2735 2771
2736/* equivalence of atoms */ 2772/* equivalence of atoms */
2737int 2773ecb_hot int
2738eqv (pointer a, pointer b) 2774eqv (pointer a, pointer b)
2739{ 2775{
2740 if (is_string (a)) 2776 if (is_string (a))
2741 { 2777 {
2742 if (is_string (b)) 2778 if (is_string (b))
… …
2745 return 0; 2781 return 0;
2746 } 2782 }
2747 else if (is_number (a)) 2783 else if (is_number (a))
2748 { 2784 {
2749 if (is_number (b)) 2785 if (is_number (b))
2750 if (num_is_integer (a) == num_is_integer (b))
2751 return num_cmp (nvalue (a), nvalue (b)) == 0; 2786 return num_cmp (nvalue (a), nvalue (b)) == 0;
2752 2787
2753 return 0; 2788 return 0;
2754 } 2789 }
2755 else if (is_character (a)) 2790 else if (is_character (a))
2756 { 2791 {
… …
2782/* () is #t in R5RS */ 2817/* () is #t in R5RS */
2783#define is_true(p) ((p) != S_F) 2818#define is_true(p) ((p) != S_F)
2784#define is_false(p) ((p) == S_F) 2819#define is_false(p) ((p) == S_F)
2785 2820
2786/* ========== Environment implementation ========== */ 2821/* ========== Environment implementation ========== */
2787
2788#if !defined(USE_ALIST_ENV) || !defined(USE_OBJECT_LIST)
2789
2790static int
2791hash_fn (const char *key, int table_size)
2792{
2793 const unsigned char *p = key;
2794 uint32_t hash = 2166136261;
2795
2796 while (*p)
2797 hash = (hash ^ *p++) * 16777619;
2798
2799 return hash % table_size;
2800}
2801#endif
2802 2822
2803#ifndef USE_ALIST_ENV 2823#ifndef USE_ALIST_ENV
2804 2824
2805/* 2825/*
2806 * In this implementation, each frame of the environment may be 2826 * In this implementation, each frame of the environment may be
… …
2823 2843
2824 SCHEME_V->envir = immutable_cons (new_frame, old_env); 2844 SCHEME_V->envir = immutable_cons (new_frame, old_env);
2825 setenvironment (SCHEME_V->envir); 2845 setenvironment (SCHEME_V->envir);
2826} 2846}
2827 2847
2848static uint32_t
2849sym_hash (pointer sym, uint32_t size)
2850{
2851 uintptr_t ptr = (uintptr_t)sym;
2852
2853#if 0
2854 /* table size is prime, so why mix */
2855 ptr += ptr >> 32;
2856 ptr += ptr >> 16;
2857 ptr += ptr >> 8;
2858#endif
2859
2860 return ptr % size;
2861}
2862
2828ecb_inline void 2863ecb_inline void
2829new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value) 2864new_slot_spec_in_env (SCHEME_P_ pointer env, pointer variable, pointer value)
2830{ 2865{
2831 pointer slot = immutable_cons (variable, value); 2866 pointer slot = immutable_cons (variable, value);
2832 2867
2833 if (is_vector (car (env))) 2868 if (is_vector (car (env)))
2834 { 2869 {
2835 int location = hash_fn (symname (variable), veclength (car (env))); 2870 int location = sym_hash (variable, veclength (car (env)));
2836
2837 set_vector_elem (car (env), location, immutable_cons (slot, vector_elem (car (env), location))); 2871 vector_set (car (env), location, immutable_cons (slot, vector_get (car (env), location)));
2838 } 2872 }
2839 else 2873 else
2840 set_car (env, immutable_cons (slot, car (env))); 2874 set_car (env, immutable_cons (slot, car (env)));
2841} 2875}
2842 2876
2843static pointer 2877ecb_hot static pointer
2844find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2878find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2845{ 2879{
2846 pointer x, y; 2880 pointer x, y;
2847 int location;
2848 2881
2849 for (x = env; x != NIL; x = cdr (x)) 2882 for (x = env; x != NIL; x = cdr (x))
2850 { 2883 {
2851 if (is_vector (car (x))) 2884 if (is_vector (car (x)))
2852 { 2885 {
2853 location = hash_fn (symname (hdl), veclength (car (x))); 2886 int location = sym_hash (hdl, veclength (car (x)));
2854 y = vector_elem (car (x), location); 2887 y = vector_get (car (x), location);
2855 } 2888 }
2856 else 2889 else
2857 y = car (x); 2890 y = car (x);
2858 2891
2859 for (; y != NIL; y = cdr (y)) 2892 for (; y != NIL; y = cdr (y))
2860 if (caar (y) == hdl) 2893 if (caar (y) == hdl)
2861 break; 2894 break;
2862 2895
2863 if (y != NIL) 2896 if (y != NIL)
2897 return car (y);
2898
2899 if (!all)
2864 break; 2900 break;
2865
2866 if (!all)
2867 return NIL;
2868 } 2901 }
2869
2870 if (x != NIL)
2871 return car (y);
2872 2902
2873 return NIL; 2903 return NIL;
2874} 2904}
2875 2905
2876#else /* USE_ALIST_ENV */ 2906#else /* USE_ALIST_ENV */
2877 2907
2878ecb_inline void 2908static void
2879new_frame_in_env (SCHEME_P_ pointer old_env) 2909new_frame_in_env (SCHEME_P_ pointer old_env)
2880{ 2910{
2881 SCHEME_V->envir = immutable_cons (NIL, old_env); 2911 SCHEME_V->envir = immutable_cons (NIL, old_env);
2882 setenvironment (SCHEME_V->envir); 2912 setenvironment (SCHEME_V->envir);
2883} 2913}
2884 2914
2885ecb_inline void 2915static void
2886new_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)
2887{ 2917{
2888 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2918 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2889} 2919}
2890 2920
2891static pointer 2921ecb_hot static pointer
2892find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2922find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2893{ 2923{
2894 pointer x, y; 2924 pointer x, y;
2895 2925
2896 for (x = env; x != NIL; x = cdr (x)) 2926 for (x = env; x != NIL; x = cdr (x))
… …
2898 for (y = car (x); y != NIL; y = cdr (y)) 2928 for (y = car (x); y != NIL; y = cdr (y))
2899 if (caar (y) == hdl) 2929 if (caar (y) == hdl)
2900 break; 2930 break;
2901 2931
2902 if (y != NIL) 2932 if (y != NIL)
2933 return car (y);
2903 break; 2934 break;
2904 2935
2905 if (!all) 2936 if (!all)
2906 return NIL; 2937 break;
2907 } 2938 }
2908
2909 if (x != NIL)
2910 return car (y);
2911 2939
2912 return NIL; 2940 return NIL;
2913} 2941}
2914 2942
2915#endif /* USE_ALIST_ENV else */ 2943#endif /* USE_ALIST_ENV else */
2916 2944
2917ecb_inline void 2945static void
2918new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2946new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2919{ 2947{
2948 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2920 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);
2921} 2950}
2922 2951
2923ecb_inline void 2952static void
2924set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2953set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2925{ 2954{
2926 set_cdr (slot, value); 2955 set_cdr (slot, value);
2927} 2956}
2928 2957
2929ecb_inline pointer 2958static pointer
2930slot_value_in_env (pointer slot) 2959slot_value_in_env (pointer slot)
2931{ 2960{
2932 return cdr (slot); 2961 return cdr (slot);
2933} 2962}
2934 2963
2935/* ========== Evaluation Cycle ========== */ 2964/* ========== Evaluation Cycle ========== */
2936 2965
2937static int 2966ecb_cold static int
2938xError_1 (SCHEME_P_ const char *s, pointer a) 2967xError_1 (SCHEME_P_ const char *s, pointer a)
2939{ 2968{
2940#if USE_ERROR_HOOK 2969#if USE_ERROR_HOOK
2941 pointer x; 2970 pointer x;
2942 pointer hdl = SCHEME_V->ERROR_HOOK; 2971 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3018 pointer code; 3047 pointer code;
3019}; 3048};
3020 3049
3021# define STACK_GROWTH 3 3050# define STACK_GROWTH 3
3022 3051
3023static void 3052ecb_hot static void
3024s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3053s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3025{ 3054{
3026 int nframes = (uintptr_t)SCHEME_V->dump; 3055 int nframes = (uintptr_t)SCHEME_V->dump;
3027 struct dump_stack_frame *next_frame; 3056 struct dump_stack_frame *next_frame;
3028 3057
3029 /* enough room for the next frame? */ 3058 /* enough room for the next frame? */
3030 if (nframes >= SCHEME_V->dump_size) 3059 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3031 { 3060 {
3032 SCHEME_V->dump_size += STACK_GROWTH; 3061 SCHEME_V->dump_size += STACK_GROWTH;
3033 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);
3034 } 3063 }
3035 3064
… …
3041 next_frame->code = code; 3070 next_frame->code = code;
3042 3071
3043 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3072 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3044} 3073}
3045 3074
3046static int 3075static ecb_hot int
3047xs_return (SCHEME_P_ pointer a) 3076xs_return (SCHEME_P_ pointer a)
3048{ 3077{
3049 int nframes = (uintptr_t)SCHEME_V->dump; 3078 int nframes = (uintptr_t)SCHEME_V->dump;
3050 struct dump_stack_frame *frame; 3079 struct dump_stack_frame *frame;
3051 3080
… …
3062 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3091 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3063 3092
3064 return 0; 3093 return 0;
3065} 3094}
3066 3095
3067ecb_inline void 3096ecb_cold void
3068dump_stack_reset (SCHEME_P) 3097dump_stack_reset (SCHEME_P)
3069{ 3098{
3070 /* 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 */
3071 SCHEME_V->dump = (pointer)+0; 3100 SCHEME_V->dump = (pointer)+0;
3072} 3101}
3073 3102
3074ecb_inline void 3103ecb_cold void
3075dump_stack_initialize (SCHEME_P) 3104dump_stack_initialize (SCHEME_P)
3076{ 3105{
3077 SCHEME_V->dump_size = 0; 3106 SCHEME_V->dump_size = 0;
3078 SCHEME_V->dump_base = 0; 3107 SCHEME_V->dump_base = 0;
3079 dump_stack_reset (SCHEME_A); 3108 dump_stack_reset (SCHEME_A);
3080} 3109}
3081 3110
3082static void 3111ecb_cold static void
3083dump_stack_free (SCHEME_P) 3112dump_stack_free (SCHEME_P)
3084{ 3113{
3085 free (SCHEME_V->dump_base); 3114 free (SCHEME_V->dump_base);
3086 SCHEME_V->dump_base = 0; 3115 SCHEME_V->dump_base = 0;
3087 SCHEME_V->dump = (pointer)0; 3116 SCHEME_V->dump = (pointer)0;
3088 SCHEME_V->dump_size = 0; 3117 SCHEME_V->dump_size = 0;
3089} 3118}
3090 3119
3091static void 3120ecb_cold static void
3092dump_stack_mark (SCHEME_P) 3121dump_stack_mark (SCHEME_P)
3093{ 3122{
3094 int nframes = (uintptr_t)SCHEME_V->dump; 3123 int nframes = (uintptr_t)SCHEME_V->dump;
3095 int i; 3124 int i;
3096 3125
… …
3102 mark (frame->envir); 3131 mark (frame->envir);
3103 mark (frame->code); 3132 mark (frame->code);
3104 } 3133 }
3105} 3134}
3106 3135
3107static pointer 3136ecb_cold static pointer
3108ss_get_cont (SCHEME_P) 3137ss_get_cont (SCHEME_P)
3109{ 3138{
3110 int nframes = (uintptr_t)SCHEME_V->dump; 3139 int nframes = (uintptr_t)SCHEME_V->dump;
3111 int i; 3140 int i;
3112 3141
… …
3124 } 3153 }
3125 3154
3126 return cont; 3155 return cont;
3127} 3156}
3128 3157
3129static void 3158ecb_cold static void
3130ss_set_cont (SCHEME_P_ pointer cont) 3159ss_set_cont (SCHEME_P_ pointer cont)
3131{ 3160{
3132 int i = 0; 3161 int i = 0;
3133 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3162 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3134 3163
3135 while (cont != NIL) 3164 while (cont != NIL)
3136 { 3165 {
3137 frame->op = ivalue (car (cont)); cont = cdr (cont); 3166 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3138 frame->args = car (cont) ; cont = cdr (cont); 3167 frame->args = car (cont) ; cont = cdr (cont);
3139 frame->envir = car (cont) ; cont = cdr (cont); 3168 frame->envir = car (cont) ; cont = cdr (cont);
3140 frame->code = car (cont) ; cont = cdr (cont); 3169 frame->code = car (cont) ; cont = cdr (cont);
3141 3170
3142 ++frame; 3171 ++frame;
3143 ++i; 3172 ++i;
3144 } 3173 }
3145 3174
3146 SCHEME_V->dump = (pointer)(uintptr_t)i; 3175 SCHEME_V->dump = (pointer)(uintptr_t)i;
3147} 3176}
3148 3177
3149#else 3178#else
3150 3179
3151ecb_inline void 3180ecb_cold void
3152dump_stack_reset (SCHEME_P) 3181dump_stack_reset (SCHEME_P)
3153{ 3182{
3154 SCHEME_V->dump = NIL; 3183 SCHEME_V->dump = NIL;
3155} 3184}
3156 3185
3157ecb_inline void 3186ecb_cold void
3158dump_stack_initialize (SCHEME_P) 3187dump_stack_initialize (SCHEME_P)
3159{ 3188{
3160 dump_stack_reset (SCHEME_A); 3189 dump_stack_reset (SCHEME_A);
3161} 3190}
3162 3191
3163static void 3192ecb_cold static void
3164dump_stack_free (SCHEME_P) 3193dump_stack_free (SCHEME_P)
3165{ 3194{
3166 SCHEME_V->dump = NIL; 3195 SCHEME_V->dump = NIL;
3167} 3196}
3168 3197
3169static int 3198ecb_hot static int
3170xs_return (SCHEME_P_ pointer a) 3199xs_return (SCHEME_P_ pointer a)
3171{ 3200{
3172 pointer dump = SCHEME_V->dump; 3201 pointer dump = SCHEME_V->dump;
3173 3202
3174 SCHEME_V->value = a; 3203 SCHEME_V->value = a;
3175 3204
3176 if (dump == NIL) 3205 if (dump == NIL)
3177 return -1; 3206 return -1;
3178 3207
3179 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3208 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3180 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3209 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3181 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3210 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3182 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3211 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3183 3212
3184 SCHEME_V->dump = dump; 3213 SCHEME_V->dump = dump;
3185 3214
3186 return 0; 3215 return 0;
3187} 3216}
3188 3217
3189static void 3218ecb_hot static void
3190s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3219s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3191{ 3220{
3192 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3221 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3193 cons (args, 3222 cons (args,
3194 cons (SCHEME_V->envir, 3223 cons (SCHEME_V->envir,
3195 cons (code, 3224 cons (code,
3196 SCHEME_V->dump)))); 3225 SCHEME_V->dump))));
3197} 3226}
3198 3227
3199static void 3228ecb_cold static void
3200dump_stack_mark (SCHEME_P) 3229dump_stack_mark (SCHEME_P)
3201{ 3230{
3202 mark (SCHEME_V->dump); 3231 mark (SCHEME_V->dump);
3203} 3232}
3204 3233
3205static pointer 3234ecb_cold static pointer
3206ss_get_cont (SCHEME_P) 3235ss_get_cont (SCHEME_P)
3207{ 3236{
3208 return SCHEME_V->dump; 3237 return SCHEME_V->dump;
3209} 3238}
3210 3239
3211static void 3240ecb_cold static void
3212ss_set_cont (SCHEME_P_ pointer cont) 3241ss_set_cont (SCHEME_P_ pointer cont)
3213{ 3242{
3214 SCHEME_V->dump = cont; 3243 SCHEME_V->dump = cont;
3215} 3244}
3216 3245
3217#endif 3246#endif
3218 3247
3219#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3248#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3220 3249
3250#if EXPERIMENT
3221static 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
3222opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3310opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3223{ 3311{
3224 pointer args = SCHEME_V->args; 3312 pointer args = SCHEME_V->args;
3225 pointer x, y; 3313 pointer x, y;
3226 3314
3227 switch (op) 3315 switch (op)
3228 { 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
3229 case OP_LOAD: /* load */ 3323 case OP_LOAD: /* load */
3230 if (file_interactive (SCHEME_A)) 3324 if (file_interactive (SCHEME_A))
3231 { 3325 {
3232 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3326 putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3233 //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)));
3234 } 3328 }
3235 3329
3236 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3330 if (!file_push (SCHEME_A_ strvalue (car (args))))
3237 Error_1 ("unable to open", car (args)); 3331 Error_1 ("unable to open", car (args));
3238 else 3332 else
… …
3242 } 3336 }
3243 3337
3244 case OP_T0LVL: /* top level */ 3338 case OP_T0LVL: /* top level */
3245 3339
3246 /* If we reached the end of file, this loop is done. */ 3340 /* If we reached the end of file, this loop is done. */
3247 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3341 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3248 { 3342 {
3249 if (SCHEME_V->file_i == 0) 3343 if (SCHEME_V->file_i == 0)
3250 { 3344 {
3251 SCHEME_V->args = NIL; 3345 SCHEME_V->args = NIL;
3252 s_goto (OP_QUIT); 3346 s_goto (OP_QUIT);
… …
3330#endif 3424#endif
3331 if (is_symbol (SCHEME_V->code)) /* symbol */ 3425 if (is_symbol (SCHEME_V->code)) /* symbol */
3332 { 3426 {
3333 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);
3334 3428
3335 if (x != NIL) 3429 if (x == NIL)
3336 s_return (slot_value_in_env (x));
3337 else
3338 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));
3339 } 3433 }
3340 else if (is_pair (SCHEME_V->code)) 3434 else if (is_pair (SCHEME_V->code))
3341 { 3435 {
3342 x = car (SCHEME_V->code); 3436 x = car (SCHEME_V->code);
3343 3437
… …
3356 } 3450 }
3357 else 3451 else
3358 s_return (SCHEME_V->code); 3452 s_return (SCHEME_V->code);
3359 3453
3360 case OP_E0ARGS: /* eval arguments */ 3454 case OP_E0ARGS: /* eval arguments */
3361 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3455 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3362 { 3456 {
3363 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3457 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3364 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3458 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3365 SCHEME_V->code = SCHEME_V->value; 3459 SCHEME_V->code = SCHEME_V->value;
3366 s_goto (OP_APPLY); 3460 s_goto (OP_APPLY);
… …
3393 3487
3394 case OP_TRACING: 3488 case OP_TRACING:
3395 { 3489 {
3396 int tr = SCHEME_V->tracing; 3490 int tr = SCHEME_V->tracing;
3397 3491
3398 SCHEME_V->tracing = ivalue (car (args)); 3492 SCHEME_V->tracing = ivalue_unchecked (car (args));
3399 s_return (mk_integer (SCHEME_A_ tr)); 3493 s_return (mk_integer (SCHEME_A_ tr));
3400 } 3494 }
3401 3495
3402#endif 3496#endif
3403 3497
… …
3420 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3514 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3421 else if (is_foreign (SCHEME_V->code)) 3515 else if (is_foreign (SCHEME_V->code))
3422 { 3516 {
3423 /* Keep nested calls from GC'ing the arglist */ 3517 /* Keep nested calls from GC'ing the arglist */
3424 push_recent_alloc (SCHEME_A_ args, NIL); 3518 push_recent_alloc (SCHEME_A_ args, NIL);
3425 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3519 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3426 3520
3427 s_return (x); 3521 s_return (x);
3428 } 3522 }
3429 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 */
3430 { 3524 {
… …
3467 3561
3468 case OP_DOMACRO: /* do macro */ 3562 case OP_DOMACRO: /* do macro */
3469 SCHEME_V->code = SCHEME_V->value; 3563 SCHEME_V->code = SCHEME_V->value;
3470 s_goto (OP_EVAL); 3564 s_goto (OP_EVAL);
3471 3565
3472#if 1
3473
3474 case OP_LAMBDA: /* lambda */ 3566 case OP_LAMBDA: /* lambda */
3475 /* 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
3476 set SCHEME_V->value fall thru */ 3568 set SCHEME_V->value fall thru */
3477 { 3569 {
3478 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);
… …
3484 SCHEME_V->code = slot_value_in_env (f); 3576 SCHEME_V->code = slot_value_in_env (f);
3485 s_goto (OP_APPLY); 3577 s_goto (OP_APPLY);
3486 } 3578 }
3487 3579
3488 SCHEME_V->value = SCHEME_V->code; 3580 SCHEME_V->value = SCHEME_V->code;
3489 /* Fallthru */
3490 } 3581 }
3582 /* Fallthru */
3491 3583
3492 case OP_LAMBDA1: 3584 case OP_LAMBDA1:
3493 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));
3494
3495#else
3496
3497 case OP_LAMBDA: /* lambda */
3498 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3499
3500#endif
3501 3586
3502 case OP_MKCLOSURE: /* make-closure */ 3587 case OP_MKCLOSURE: /* make-closure */
3503 x = car (args); 3588 x = car (args);
3504 3589
3505 if (car (x) == SCHEME_V->LAMBDA) 3590 if (car (x) == SCHEME_V->LAMBDA)
… …
3912 SCHEME_V->code = car (args); 3997 SCHEME_V->code = car (args);
3913 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL); 3998 SCHEME_V->args = cons (mk_continuation (SCHEME_A_ ss_get_cont (SCHEME_A)), NIL);
3914 s_goto (OP_APPLY); 3999 s_goto (OP_APPLY);
3915 } 4000 }
3916 4001
3917 abort (); 4002 if (USE_ERROR_CHECKING) abort ();
3918} 4003}
3919 4004
3920static int 4005/* math, cxr */
4006ecb_hot static int
3921opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4007opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3922{ 4008{
3923 pointer args = SCHEME_V->args; 4009 pointer args = SCHEME_V->args;
3924 pointer x = car (args); 4010 pointer x = car (args);
3925 num v; 4011 num v;
3926 4012
3927#if USE_MATH
3928 RVALUE dd;
3929#endif
3930
3931 switch (op) 4013 switch (op)
3932 { 4014 {
3933#if USE_MATH 4015#if USE_MATH
3934 case OP_INEX2EX: /* inexact->exact */ 4016 case OP_INEX2EX: /* inexact->exact */
3935 if (num_is_integer (x)) 4017 if (!is_integer (x))
3936 s_return (x); 4018 {
3937 else if (modf (rvalue_unchecked (x), &dd) == 0) 4019 RVALUE r = rvalue_unchecked (x);
3938 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4020
4021 if (r == (RVALUE)(IVALUE)r)
4022 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3939 else 4023 else
3940 Error_1 ("inexact->exact: not integral:", x); 4024 Error_1 ("inexact->exact: not integral:", x);
4025 }
3941 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))));
3942 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))));
3943 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))))));
3944 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))));
3945 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))));
3946 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))));
3947 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))));
3948 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))));
3949 4043
3950 case OP_ATAN: 4044 case OP_ATAN:
4045 s_return (mk_real (SCHEME_A_
3951 if (cdr (args) == NIL) 4046 cdr (args) == NIL
3952 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4047 ? atan (rvalue (x))
3953 else 4048 : atan2 (rvalue (x), rvalue (cadr (args)))));
3954 {
3955 pointer y = cadr (args);
3956 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3957 }
3958
3959 case OP_SQRT:
3960 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3961 4049
3962 case OP_EXPT: 4050 case OP_EXPT:
3963 { 4051 {
3964 RVALUE result; 4052 RVALUE result;
3965 int real_result = 1; 4053 int real_result = 1;
3966 pointer y = cadr (args); 4054 pointer y = cadr (args);
3967 4055
3968 if (num_is_integer (x) && num_is_integer (y)) 4056 if (is_integer (x) && is_integer (y))
3969 real_result = 0; 4057 real_result = 0;
3970 4058
3971 /* This 'if' is an R5RS compatibility fix. */ 4059 /* This 'if' is an R5RS compatibility fix. */
3972 /* NOTE: Remove this 'if' fix for R6RS. */ 4060 /* NOTE: Remove this 'if' fix for R6RS. */
3973 if (rvalue (x) == 0 && rvalue (y) < 0) 4061 if (rvalue (x) == 0 && rvalue (y) < 0)
… …
3979 /* If the test fails, result is too big for integer. */ 4067 /* If the test fails, result is too big for integer. */
3980 if (!real_result) 4068 if (!real_result)
3981 { 4069 {
3982 long result_as_long = result; 4070 long result_as_long = result;
3983 4071
3984 if (result != (RVALUE) result_as_long) 4072 if (result != result_as_long)
3985 real_result = 1; 4073 real_result = 1;
3986 } 4074 }
3987 4075
3988 if (real_result) 4076 if (real_result)
3989 s_return (mk_real (SCHEME_A_ result)); 4077 s_return (mk_real (SCHEME_A_ result));
3990 else 4078 else
3991 s_return (mk_integer (SCHEME_A_ result)); 4079 s_return (mk_integer (SCHEME_A_ result));
3992 } 4080 }
3993
3994 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
3995 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3996
3997 case OP_TRUNCATE:
3998 {
3999 RVALUE rvalue_of_x;
4000
4001 rvalue_of_x = rvalue (x);
4002
4003 if (rvalue_of_x > 0)
4004 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4005 else
4006 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4007 }
4008
4009 case OP_ROUND:
4010 if (num_is_integer (x))
4011 s_return (x);
4012
4013 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4014#endif 4081#endif
4015 4082
4016 case OP_ADD: /* + */ 4083 case OP_ADD: /* + */
4017 v = num_zero; 4084 v = num_zero;
4018 4085
… …
4106 else 4173 else
4107 Error_0 ("modulo: division by zero"); 4174 Error_0 ("modulo: division by zero");
4108 4175
4109 s_return (mk_number (SCHEME_A_ v)); 4176 s_return (mk_number (SCHEME_A_ v));
4110 4177
4111 case OP_CAR: /* car */ 4178 /* the compiler will optimize this mess... */
4112 s_return (caar (args)); 4179 case OP_CAR: op_car: s_return (car (x));
4113 4180 case OP_CDR: op_cdr: s_return (cdr (x));
4114 case OP_CDR: /* cdr */ 4181 case OP_CAAR: op_caar: x = car (x); goto op_car;
4115 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;
4116 4209
4117 case OP_CONS: /* cons */ 4210 case OP_CONS: /* cons */
4118 set_cdr (args, cadr (args)); 4211 set_cdr (args, cadr (args));
4119 s_return (args); 4212 s_return (args);
4120 4213
… …
4135 } 4228 }
4136 else 4229 else
4137 Error_0 ("set-cdr!: unable to alter immutable pair"); 4230 Error_0 ("set-cdr!: unable to alter immutable pair");
4138 4231
4139 case OP_CHAR2INT: /* char->integer */ 4232 case OP_CHAR2INT: /* char->integer */
4140 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4233 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4141 4234
4142 case OP_INT2CHAR: /* integer->char */ 4235 case OP_INT2CHAR: /* integer->char */
4143 s_return (mk_character (SCHEME_A_ ivalue (x))); 4236 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4144 4237
4145 case OP_CHARUPCASE: 4238 case OP_CHARUPCASE:
4146 { 4239 {
4147 unsigned char c = ivalue (x); 4240 unsigned char c = ivalue_unchecked (x);
4148 c = toupper (c); 4241 c = toupper (c);
4149 s_return (mk_character (SCHEME_A_ c)); 4242 s_return (mk_character (SCHEME_A_ c));
4150 } 4243 }
4151 4244
4152 case OP_CHARDNCASE: 4245 case OP_CHARDNCASE:
4153 { 4246 {
4154 unsigned char c = ivalue (x); 4247 unsigned char c = ivalue_unchecked (x);
4155 c = tolower (c); 4248 c = tolower (c);
4156 s_return (mk_character (SCHEME_A_ c)); 4249 s_return (mk_character (SCHEME_A_ c));
4157 } 4250 }
4158 4251
4159 case OP_STR2SYM: /* string->symbol */ 4252 case OP_STR2SYM: /* string->symbol */
… …
4236 Error_1 ("atom->string: not an atom:", x); 4329 Error_1 ("atom->string: not an atom:", x);
4237 } 4330 }
4238 4331
4239 case OP_MKSTRING: /* make-string */ 4332 case OP_MKSTRING: /* make-string */
4240 { 4333 {
4241 int fill = ' '; 4334 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4242 int len;
4243
4244 len = ivalue (x); 4335 int len = ivalue_unchecked (x);
4245
4246 if (cdr (args) != NIL)
4247 fill = charvalue (cadr (args));
4248 4336
4249 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4337 s_return (mk_empty_string (SCHEME_A_ len, fill));
4250 } 4338 }
4251 4339
4252 case OP_STRLEN: /* string-length */ 4340 case OP_STRLEN: /* string-length */
4253 s_return (mk_integer (SCHEME_A_ strlength (x))); 4341 s_return (mk_integer (SCHEME_A_ strlength (x)));
4254 4342
4255 case OP_STRREF: /* string-ref */ 4343 case OP_STRREF: /* string-ref */
4256 { 4344 {
4257 char *str;
4258 int index;
4259
4260 str = strvalue (x); 4345 char *str = strvalue (x);
4261
4262 index = ivalue (cadr (args)); 4346 int index = ivalue_unchecked (cadr (args));
4263 4347
4264 if (index >= strlength (x)) 4348 if (index >= strlength (x))
4265 Error_1 ("string-ref: out of bounds:", cadr (args)); 4349 Error_1 ("string-ref: out of bounds:", cadr (args));
4266 4350
4267 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4351 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4268 } 4352 }
4269 4353
4270 case OP_STRSET: /* string-set! */ 4354 case OP_STRSET: /* string-set! */
4271 { 4355 {
4272 char *str; 4356 char *str = strvalue (x);
4273 int index; 4357 int index = ivalue_unchecked (cadr (args));
4274 int c; 4358 int c;
4275 4359
4276 if (is_immutable (x)) 4360 if (is_immutable (x))
4277 Error_1 ("string-set!: unable to alter immutable string:", x); 4361 Error_1 ("string-set!: unable to alter immutable string:", x);
4278
4279 str = strvalue (x);
4280
4281 index = ivalue (cadr (args));
4282 4362
4283 if (index >= strlength (x)) 4363 if (index >= strlength (x))
4284 Error_1 ("string-set!: out of bounds:", cadr (args)); 4364 Error_1 ("string-set!: out of bounds:", cadr (args));
4285 4365
4286 c = charvalue (caddr (args)); 4366 c = charvalue (caddr (args));
… …
4307 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4387 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4308 4388
4309 s_return (newstr); 4389 s_return (newstr);
4310 } 4390 }
4311 4391
4312 case OP_SUBSTR: /* substring */ 4392 case OP_STRING_COPY: /* substring/string-copy */
4313 { 4393 {
4314 char *str; 4394 char *str = strvalue (x);
4315 int index0; 4395 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4316 int index1; 4396 int index1;
4317 int len; 4397 int len;
4318 4398
4319 str = strvalue (x);
4320
4321 index0 = ivalue (cadr (args));
4322
4323 if (index0 > strlength (x)) 4399 if (index0 > strlength (x))
4324 Error_1 ("substring: start out of bounds:", cadr (args)); 4400 Error_1 ("string->copy: start out of bounds:", cadr (args));
4325 4401
4326 if (cddr (args) != NIL) 4402 if (cddr (args) != NIL)
4327 { 4403 {
4328 index1 = ivalue (caddr (args)); 4404 index1 = ivalue_unchecked (caddr (args));
4329 4405
4330 if (index1 > strlength (x) || index1 < index0) 4406 if (index1 > strlength (x) || index1 < index0)
4331 Error_1 ("substring: end out of bounds:", caddr (args)); 4407 Error_1 ("string->copy: end out of bounds:", caddr (args));
4332 } 4408 }
4333 else 4409 else
4334 index1 = strlength (x); 4410 index1 = strlength (x);
4335 4411
4336 len = index1 - index0; 4412 len = index1 - index0;
4337 x = mk_empty_string (SCHEME_A_ len, ' '); 4413 x = mk_counted_string (SCHEME_A_ str + index0, len);
4338 memcpy (strvalue (x), str + index0, len);
4339 strvalue (x)[len] = 0;
4340 4414
4341 s_return (x); 4415 s_return (x);
4342 } 4416 }
4343 4417
4344 case OP_VECTOR: /* vector */ 4418 case OP_VECTOR: /* vector */
… …
4356 if (SCHEME_V->no_memory) 4430 if (SCHEME_V->no_memory)
4357 s_return (S_SINK); 4431 s_return (S_SINK);
4358#endif 4432#endif
4359 4433
4360 for (x = args, i = 0; is_pair (x); x = cdr (x), i++) 4434 for (x = args, i = 0; is_pair (x); x = cdr (x), i++)
4361 set_vector_elem (vec, i, car (x)); 4435 vector_set (vec, i, car (x));
4362 4436
4363 s_return (vec); 4437 s_return (vec);
4364 } 4438 }
4365 4439
4366 case OP_MKVECTOR: /* make-vector */ 4440 case OP_MKVECTOR: /* make-vector */
4367 { 4441 {
4368 pointer fill = NIL; 4442 pointer fill = NIL;
4369 int len;
4370 pointer vec; 4443 pointer vec;
4371
4372 len = ivalue (x); 4444 int len = ivalue_unchecked (x);
4373 4445
4374 if (cdr (args) != NIL) 4446 if (cdr (args) != NIL)
4375 fill = cadr (args); 4447 fill = cadr (args);
4376 4448
4377 vec = mk_vector (SCHEME_A_ len); 4449 vec = mk_vector (SCHEME_A_ len);
… …
4380 if (SCHEME_V->no_memory) 4452 if (SCHEME_V->no_memory)
4381 s_return (S_SINK); 4453 s_return (S_SINK);
4382#endif 4454#endif
4383 4455
4384 if (fill != NIL) 4456 if (fill != NIL)
4385 fill_vector (vec, fill); 4457 fill_vector (vec, 0, fill);
4386 4458
4387 s_return (vec); 4459 s_return (vec);
4388 } 4460 }
4389 4461
4390 case OP_VECLEN: /* vector-length */ 4462 case OP_VECLEN: /* vector-length */
4391 s_return (mk_integer (SCHEME_A_ veclength (x))); 4463 s_return (mk_integer (SCHEME_A_ veclength (x)));
4392 4464
4465 case OP_VECRESIZE:
4466 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4467 s_return (x);
4468
4393 case OP_VECREF: /* vector-ref */ 4469 case OP_VECREF: /* vector-ref */
4394 { 4470 {
4395 int index;
4396
4397 index = ivalue (cadr (args)); 4471 int index = ivalue_unchecked (cadr (args));
4398 4472
4399 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4473 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4400 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4474 Error_1 ("vector-ref: out of bounds:", cadr (args));
4401 4475
4402 s_return (vector_elem (x, index)); 4476 s_return (vector_get (x, index));
4403 } 4477 }
4404 4478
4405 case OP_VECSET: /* vector-set! */ 4479 case OP_VECSET: /* vector-set! */
4406 { 4480 {
4407 int index; 4481 int index = ivalue_unchecked (cadr (args));
4408 4482
4409 if (is_immutable (x)) 4483 if (is_immutable (x))
4410 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4484 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4411 4485
4412 index = ivalue (cadr (args));
4413
4414 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4486 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4415 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4487 Error_1 ("vector-set!: out of bounds:", cadr (args));
4416 4488
4417 set_vector_elem (x, index, caddr (args)); 4489 vector_set (x, index, caddr (args));
4418 s_return (x); 4490 s_return (x);
4419 } 4491 }
4420 } 4492 }
4421 4493
4422 abort (); 4494 if (USE_ERROR_CHECKING) abort ();
4423} 4495}
4424 4496
4425INTERFACE int 4497/* relational ops */
4426is_list (SCHEME_P_ pointer a) 4498ecb_hot static int
4427{
4428 return list_length (SCHEME_A_ a) >= 0;
4429}
4430
4431/* Result is:
4432 proper list: length
4433 circular list: -1
4434 not even a pair: -2
4435 dotted list: -2 minus length before dot
4436*/
4437INTERFACE int
4438list_length (SCHEME_P_ pointer a)
4439{
4440 int i = 0;
4441 pointer slow, fast;
4442
4443 slow = fast = a;
4444
4445 while (1)
4446 {
4447 if (fast == NIL)
4448 return i;
4449
4450 if (!is_pair (fast))
4451 return -2 - i;
4452
4453 fast = cdr (fast);
4454 ++i;
4455
4456 if (fast == NIL)
4457 return i;
4458
4459 if (!is_pair (fast))
4460 return -2 - i;
4461
4462 ++i;
4463 fast = cdr (fast);
4464
4465 /* Safe because we would have already returned if `fast'
4466 encountered a non-pair. */
4467 slow = cdr (slow);
4468
4469 if (fast == slow)
4470 {
4471 /* the fast pointer has looped back around and caught up
4472 with the slow pointer, hence the structure is circular,
4473 not of finite length, and therefore not a list */
4474 return -1;
4475 }
4476 }
4477}
4478
4479static int
4480opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4499opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4481{ 4500{
4482 pointer x = SCHEME_V->args; 4501 pointer x = SCHEME_V->args;
4483 4502
4484 for (;;) 4503 for (;;)
… …
4505 } 4524 }
4506 4525
4507 s_return (S_T); 4526 s_return (S_T);
4508} 4527}
4509 4528
4510static int 4529/* predicates */
4530ecb_hot static int
4511opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4531opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4512{ 4532{
4513 pointer args = SCHEME_V->args; 4533 pointer args = SCHEME_V->args;
4514 pointer a = car (args); 4534 pointer a = car (args);
4515 pointer d = cdr (args); 4535 pointer d = cdr (args);
4516 int r; 4536 int r;
4517 4537
4518 switch (op) 4538 switch (op)
4519 { 4539 {
4520 case OP_NOT: /* not */ r = is_false (a) ; break; 4540 case OP_NOT: /* not */ r = is_false (a) ; break;
4521 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;
4522 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4542 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4523 case OP_NULLP: /* null? */ r = a == NIL ; break; 4543 case OP_NULLP: /* null? */ r = a == NIL ; break;
4524 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;
4525 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4546 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4526 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4547 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4527 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4548 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4528 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 */
4529 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4550 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4530 4551
4531#if USE_CHAR_CLASSIFIERS 4552#if USE_CHAR_CLASSIFIERS
4532 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4553 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4533 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4554 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4534 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4555 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4535 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4556 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4536 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4557 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4537#endif 4558#endif
4538 4559
4539#if USE_PORTS 4560#if USE_PORTS
4540 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4561 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4541 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4562 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
… …
4561 } 4582 }
4562 4583
4563 s_retbool (r); 4584 s_retbool (r);
4564} 4585}
4565 4586
4566static int 4587/* promises, list ops, ports */
4588ecb_hot static int
4567opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4589opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4568{ 4590{
4569 pointer args = SCHEME_V->args; 4591 pointer args = SCHEME_V->args;
4570 pointer a = car (args); 4592 pointer a = car (args);
4571 pointer x, y; 4593 pointer x, y;
… …
4584 } 4606 }
4585 else 4607 else
4586 s_return (SCHEME_V->code); 4608 s_return (SCHEME_V->code);
4587 4609
4588 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4610 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4589 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4611 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4590 s_return (SCHEME_V->value); 4612 s_return (SCHEME_V->value);
4591 4613
4592#if USE_PORTS 4614#if USE_PORTS
4615
4616 case OP_EOF_OBJECT: /* eof-object */
4617 s_return (S_EOF);
4593 4618
4594 case OP_WRITE: /* write */ 4619 case OP_WRITE: /* write */
4595 case OP_DISPLAY: /* display */ 4620 case OP_DISPLAY: /* display */
4596 case OP_WRITE_CHAR: /* write-char */ 4621 case OP_WRITE_CHAR: /* write-char */
4597 if (is_pair (cdr (SCHEME_V->args))) 4622 if (is_pair (cdr (SCHEME_V->args)))
… …
4739 SCHEME_V->gc_verbose = (a != S_F); 4764 SCHEME_V->gc_verbose = (a != S_F);
4740 s_retbool (was); 4765 s_retbool (was);
4741 } 4766 }
4742 4767
4743 case OP_NEWSEGMENT: /* new-segment */ 4768 case OP_NEWSEGMENT: /* new-segment */
4769#if 0
4744 if (!is_pair (args) || !is_number (a)) 4770 if (!is_pair (args) || !is_number (a))
4745 Error_0 ("new-segment: argument must be a number"); 4771 Error_0 ("new-segment: argument must be a number");
4746 4772#endif
4747 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 4773 s_retbool (alloc_cellseg (SCHEME_A));
4748
4749 s_return (S_T);
4750 4774
4751 case OP_OBLIST: /* oblist */ 4775 case OP_OBLIST: /* oblist */
4752 s_return (oblist_all_symbols (SCHEME_A)); 4776 s_return (oblist_all_symbols (SCHEME_A));
4753 4777
4754#if USE_PORTS 4778#if USE_PORTS
… …
4824 s_return (p == NIL ? S_F : p); 4848 s_return (p == NIL ? S_F : p);
4825 } 4849 }
4826 4850
4827 case OP_GET_OUTSTRING: /* get-output-string */ 4851 case OP_GET_OUTSTRING: /* get-output-string */
4828 { 4852 {
4829 port *p; 4853 port *p = port (a);
4830 4854
4831 if ((p = a->object.port)->kind & port_string) 4855 if (p->kind & port_string)
4832 { 4856 {
4833 off_t size; 4857 off_t size;
4834 char *str; 4858 char *str;
4835 4859
4836 size = p->rep.string.curr - p->rep.string.start + 1; 4860 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4868 case OP_CURR_ENV: /* current-environment */ 4892 case OP_CURR_ENV: /* current-environment */
4869 s_return (SCHEME_V->envir); 4893 s_return (SCHEME_V->envir);
4870 4894
4871 } 4895 }
4872 4896
4873 abort (); 4897 if (USE_ERROR_CHECKING) abort ();
4874} 4898}
4875 4899
4876static int 4900/* reading */
4901ecb_cold static int
4877opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4902opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4878{ 4903{
4879 pointer args = SCHEME_V->args; 4904 pointer args = SCHEME_V->args;
4880 pointer x; 4905 pointer x;
4881 4906
… …
4941 int res; 4966 int res;
4942 4967
4943 if (is_pair (args)) 4968 if (is_pair (args))
4944 p = car (args); 4969 p = car (args);
4945 4970
4946 res = p->object.port->kind & port_string; 4971 res = port (p)->kind & port_string;
4947 4972
4948 s_retbool (res); 4973 s_retbool (res);
4949 } 4974 }
4950 4975
4951 case OP_SET_INPORT: /* set-input-port */ 4976 case OP_SET_INPORT: /* set-input-port */
… …
5010 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5035 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5011 SCHEME_V->tok = token (SCHEME_A); 5036 SCHEME_V->tok = token (SCHEME_A);
5012 s_goto (OP_RDSEXPR); 5037 s_goto (OP_RDSEXPR);
5013 5038
5014 case TOK_ATOM: 5039 case TOK_ATOM:
5015 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))); 5040 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS)));
5041
5042 case TOK_DOTATOM:
5043 SCHEME_V->strbuff[0] = '.';
5044 s_return (mk_atom (SCHEME_A_ readstr_upto (SCHEME_A_ 1, DELIMITERS)));
5045
5046 case TOK_STRATOM:
5047 x = readstrexp (SCHEME_A_ '|');
5048 //TODO: haven't checked whether the garbage collector could interfere
5049 s_return (mk_atom (SCHEME_A_ strvalue (x)));
5016 5050
5017 case TOK_DQUOTE: 5051 case TOK_DQUOTE:
5018 x = readstrexp (SCHEME_A); 5052 x = readstrexp (SCHEME_A_ '"');
5019 5053
5020 if (x == S_F) 5054 if (x == S_F)
5021 Error_0 ("Error reading string"); 5055 Error_0 ("Error reading string");
5022 5056
5023 setimmutable (x); 5057 setimmutable (x);
… …
5035 s_goto (OP_EVAL); 5069 s_goto (OP_EVAL);
5036 } 5070 }
5037 } 5071 }
5038 5072
5039 case TOK_SHARP_CONST: 5073 case TOK_SHARP_CONST:
5040 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ DELIMITERS))) == NIL) 5074 if ((x = mk_sharp_const (SCHEME_A_ readstr_upto (SCHEME_A_ 0, DELIMITERS))) == NIL)
5041 Error_0 ("undefined sharp expression"); 5075 Error_0 ("undefined sharp expression");
5042 else 5076 else
5043 s_return (x); 5077 s_return (x);
5044 5078
5045 default: 5079 default:
… …
5197 putstr (SCHEME_A_ ")"); 5231 putstr (SCHEME_A_ ")");
5198 s_return (S_T); 5232 s_return (S_T);
5199 } 5233 }
5200 else 5234 else
5201 { 5235 {
5202 pointer elem = vector_elem (vec, i); 5236 pointer elem = vector_get (vec, i);
5203 5237
5204 ivalue_unchecked (cdr (args)) = i + 1; 5238 ivalue_unchecked (cdr (args)) = i + 1;
5205 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5239 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5206 SCHEME_V->args = elem; 5240 SCHEME_V->args = elem;
5207 5241
… …
5211 s_goto (OP_P0LIST); 5245 s_goto (OP_P0LIST);
5212 } 5246 }
5213 } 5247 }
5214 } 5248 }
5215 5249
5216 abort (); 5250 if (USE_ERROR_CHECKING) abort ();
5217} 5251}
5218 5252
5219static int 5253/* list ops */
5254ecb_hot static int
5220opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5255opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5221{ 5256{
5222 pointer args = SCHEME_V->args; 5257 pointer args = SCHEME_V->args;
5223 pointer a = car (args); 5258 pointer a = car (args);
5224 pointer x, y; 5259 pointer x, y;
… …
5267 5302
5268 case OP_CLOSUREP: /* closure? */ 5303 case OP_CLOSUREP: /* closure? */
5269 /* 5304 /*
5270 * Note, macro object is also a closure. 5305 * Note, macro object is also a closure.
5271 * Therefore, (closure? <#MACRO>) ==> #t 5306 * Therefore, (closure? <#MACRO>) ==> #t
5307 * (schmorp) well, obviously not, fix? TODO
5272 */ 5308 */
5273 s_retbool (is_closure (a)); 5309 s_retbool (is_closure (a));
5274 5310
5275 case OP_MACROP: /* macro? */ 5311 case OP_MACROP: /* macro? */
5276 s_retbool (is_macro (a)); 5312 s_retbool (is_macro (a));
5277 } 5313 }
5278 5314
5279 abort (); 5315 if (USE_ERROR_CHECKING) abort ();
5280} 5316}
5281 5317
5282/* 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 */
5283typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5319typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5284 5320
5285typedef int (*test_predicate)(pointer); 5321typedef int (*test_predicate)(pointer);
5286static int 5322
5323ecb_hot static int
5287is_any (pointer p) 5324tst_any (pointer p)
5288{ 5325{
5289 return 1; 5326 return 1;
5290} 5327}
5291 5328
5292static int 5329ecb_hot static int
5293is_nonneg (pointer p) 5330tst_inonneg (pointer p)
5294{ 5331{
5295 return ivalue (p) >= 0 && is_integer (p); 5332 return is_integer (p) && ivalue_unchecked (p) >= 0;
5296} 5333}
5297 5334
5298static int 5335ecb_hot static int
5299tst_is_list (pointer p) 5336tst_is_list (SCHEME_P_ pointer p)
5300{ 5337{
5301 return p == NIL || is_pair (p); 5338 return p == NIL || is_pair (p);
5302} 5339}
5303 5340
5304/* Correspond carefully with following defines! */ 5341/* Correspond carefully with following defines! */
5305static struct 5342static struct
5306{ 5343{
5307 test_predicate fct; 5344 test_predicate fct;
5308 const char *kind; 5345 const char *kind;
5309} tests[] = 5346} tests[] = {
5310{
5311 { is_any, 0 }, 5347 { tst_any , 0 },
5312 { is_string, "string" }, 5348 { is_string , "string" },
5313 { is_symbol, "symbol" }, 5349 { is_symbol , "symbol" },
5314 { is_port, "port" }, 5350 { is_port , "port" },
5315 { is_inport, "input port" }, 5351 { is_inport , "input port" },
5316 { is_outport, "output port" }, 5352 { is_outport , "output port" },
5317 { is_environment, "environment" }, 5353 { is_environment, "environment" },
5318 { is_pair, "pair" }, 5354 { is_pair , "pair" },
5319 { tst_is_list, "pair or '()" }, 5355 { 0 , "pair or '()" },
5320 { is_character, "character" }, 5356 { is_character , "character" },
5321 { is_vector, "vector" }, 5357 { is_vector , "vector" },
5322 { is_number, "number" }, 5358 { is_number , "number" },
5323 { is_integer, "integer" }, 5359 { is_integer , "integer" },
5324 { is_nonneg, "non-negative integer" } 5360 { tst_inonneg , "non-negative integer" }
5325}; 5361};
5326 5362
5327#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */ 5363#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5328#define TST_ANY "\001" 5364#define TST_ANY "\001"
5329#define TST_STRING "\002" 5365#define TST_STRING "\002"
… …
5347#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5383#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5348#include "opdefines.h" 5384#include "opdefines.h"
5349#undef OP_DEF 5385#undef OP_DEF
5350; 5386;
5351 5387
5352static const char * 5388ecb_cold static const char *
5353opname (int idx) 5389opname (int idx)
5354{ 5390{
5355 const char *name = opnames; 5391 const char *name = opnames;
5356 5392
5357 /* 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? */
… …
5359 name += strlen (name) + 1; 5395 name += strlen (name) + 1;
5360 5396
5361 return *name ? name : "ILLEGAL"; 5397 return *name ? name : "ILLEGAL";
5362} 5398}
5363 5399
5364static const char * 5400ecb_cold static const char *
5365procname (pointer x) 5401procname (pointer x)
5366{ 5402{
5367 return opname (procnum (x)); 5403 return opname (procnum (x));
5368} 5404}
5369 5405
5370typedef struct 5406typedef struct
5371{ 5407{
5372 uint8_t func; 5408 uint8_t func;
5373 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */ 5409 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5374 uint8_t builtin; 5410 uint8_t builtin;
5411#if USE_ERROR_CHECKING
5375 uint8_t min_arity; 5412 uint8_t min_arity;
5376 uint8_t max_arity; 5413 uint8_t max_arity;
5377 char arg_tests_encoding[3]; 5414 char arg_tests_encoding[3];
5415#endif
5378} op_code_info; 5416} op_code_info;
5379 5417
5380static const op_code_info dispatch_table[] = { 5418static const op_code_info dispatch_table[] = {
5419#if USE_ERROR_CHECKING
5381#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest }, 5420#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1, minarity, maxarity, argtest },
5421#else
5422#define OP_DEF(func,name,minarity,maxarity,argtest,op) { func, sizeof (name) > 1 },
5423#endif
5382#include "opdefines.h" 5424#include "opdefines.h"
5383#undef OP_DEF 5425#undef OP_DEF
5384 {0} 5426 {0}
5385}; 5427};
5386 5428
5387/* kernel of this interpreter */ 5429/* kernel of this interpreter */
5388static void ecb_hot 5430ecb_hot static void
5389Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5431Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5390{ 5432{
5391 SCHEME_V->op = op; 5433 SCHEME_V->op = op;
5392 5434
5393 for (;;) 5435 for (;;)
… …
5428 { 5470 {
5429 pointer arg = car (arglist); 5471 pointer arg = car (arglist);
5430 5472
5431 j = t[0]; 5473 j = t[0];
5432 5474
5475 /*TODO: tst_is_list has different prototype - fix if other tests acquire same prototype */
5476 if (j == TST_LIST[0])
5477 {
5478 if (!tst_is_list (SCHEME_A_ arg))
5479 break;
5480 }
5481 else
5482 {
5433 if (!tests[j - 1].fct (arg)) 5483 if (!tests[j - 1].fct (arg))
5434 break; 5484 break;
5485 }
5435 5486
5436 if (t[1]) /* last test is replicated as necessary */ 5487 if (t < pcd->arg_tests_encoding + sizeof (pcd->arg_tests_encoding) - 1 && t[1]) /* last test is replicated as necessary */
5437 t++; 5488 t++;
5438 5489
5439 arglist = cdr (arglist); 5490 arglist = cdr (arglist);
5440 i++; 5491 i++;
5441 } 5492 }
… …
5467 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))
5468 return; 5519 return;
5469 5520
5470 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5521 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5471 { 5522 {
5472 xwrstr ("No memory!\n"); 5523 putstr (SCHEME_A_ "No memory!\n");
5473 return; 5524 return;
5474 } 5525 }
5475 } 5526 }
5476} 5527}
5477 5528
5478/* ========== Initialization of internal keywords ========== */ 5529/* ========== Initialization of internal keywords ========== */
5479 5530
5480static void 5531ecb_cold static void
5481assign_syntax (SCHEME_P_ const char *name) 5532assign_syntax (SCHEME_P_ const char *name)
5482{ 5533{
5483 pointer x = oblist_add_by_name (SCHEME_A_ name); 5534 pointer x = oblist_add_by_name (SCHEME_A_ name);
5484 set_typeflag (x, typeflag (x) | T_SYNTAX); 5535 set_typeflag (x, typeflag (x) | T_SYNTAX);
5485} 5536}
5486 5537
5487static void 5538ecb_cold static void
5488assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5539assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5489{ 5540{
5490 pointer x = mk_symbol (SCHEME_A_ name); 5541 pointer x = mk_symbol (SCHEME_A_ name);
5491 pointer y = mk_proc (SCHEME_A_ op); 5542 pointer y = mk_proc (SCHEME_A_ op);
5492 new_slot_in_env (SCHEME_A_ x, y); 5543 new_slot_in_env (SCHEME_A_ x, y);
… …
5496mk_proc (SCHEME_P_ enum scheme_opcodes op) 5547mk_proc (SCHEME_P_ enum scheme_opcodes op)
5497{ 5548{
5498 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5549 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5499 set_typeflag (y, (T_PROC | T_ATOM)); 5550 set_typeflag (y, (T_PROC | T_ATOM));
5500 ivalue_unchecked (y) = op; 5551 ivalue_unchecked (y) = op;
5501 set_num_integer (y);
5502 return y; 5552 return y;
5503} 5553}
5504 5554
5505/* 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! */
5506static int 5556ecb_hot static int
5507syntaxnum (pointer p) 5557syntaxnum (pointer p)
5508{ 5558{
5509 const char *s = strvalue (car (p)); 5559 const char *s = strvalue (p);
5510 5560
5511 switch (strlength (car (p))) 5561 switch (strlength (p))
5512 { 5562 {
5513 case 2: 5563 case 2:
5514 if (s[0] == 'i') 5564 if (s[0] == 'i')
5515 return OP_IF0; /* if */ 5565 return OP_IF0; /* if */
5516 else 5566 else
… …
5591ecb_cold int 5641ecb_cold int
5592scheme_init (SCHEME_P) 5642scheme_init (SCHEME_P)
5593{ 5643{
5594 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5644 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5595 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));
5596 5652
5597 num_set_fixnum (num_zero, 1); 5653 num_set_fixnum (num_zero, 1);
5598 num_set_ivalue (num_zero, 0); 5654 num_set_ivalue (num_zero, 0);
5599 num_set_fixnum (num_one, 1); 5655 num_set_fixnum (num_one, 1);
5600 num_set_ivalue (num_one, 1); 5656 num_set_ivalue (num_one, 1);
… …
5612 SCHEME_V->save_inport = NIL; 5668 SCHEME_V->save_inport = NIL;
5613 SCHEME_V->loadport = NIL; 5669 SCHEME_V->loadport = NIL;
5614 SCHEME_V->nesting = 0; 5670 SCHEME_V->nesting = 0;
5615 SCHEME_V->interactive_repl = 0; 5671 SCHEME_V->interactive_repl = 0;
5616 5672
5617 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5673 if (!alloc_cellseg (SCHEME_A))
5618 { 5674 {
5619#if USE_ERROR_CHECKING 5675#if USE_ERROR_CHECKING
5620 SCHEME_V->no_memory = 1; 5676 SCHEME_V->no_memory = 1;
5621 return 0; 5677 return 0;
5622#endif 5678#endif
… …
5690 5746
5691 return !SCHEME_V->no_memory; 5747 return !SCHEME_V->no_memory;
5692} 5748}
5693 5749
5694#if USE_PORTS 5750#if USE_PORTS
5695void 5751ecb_cold void
5696scheme_set_input_port_file (SCHEME_P_ int fin) 5752scheme_set_input_port_file (SCHEME_P_ int fin)
5697{ 5753{
5698 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 5754 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5699} 5755}
5700 5756
5701void 5757ecb_cold void
5702scheme_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)
5703{ 5759{
5704 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);
5705} 5761}
5706 5762
5707void 5763ecb_cold void
5708scheme_set_output_port_file (SCHEME_P_ int fout) 5764scheme_set_output_port_file (SCHEME_P_ int fout)
5709{ 5765{
5710 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 5766 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5711} 5767}
5712 5768
5713void 5769ecb_cold void
5714scheme_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)
5715{ 5771{
5716 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);
5717} 5773}
5718#endif 5774#endif
5719 5775
5720void 5776ecb_cold void
5721scheme_set_external_data (SCHEME_P_ void *p) 5777scheme_set_external_data (SCHEME_P_ void *p)
5722{ 5778{
5723 SCHEME_V->ext_data = p; 5779 SCHEME_V->ext_data = p;
5724} 5780}
5725 5781
… …
5773 } 5829 }
5774 } 5830 }
5775#endif 5831#endif
5776} 5832}
5777 5833
5778void 5834ecb_cold void
5779scheme_load_file (SCHEME_P_ int fin) 5835scheme_load_file (SCHEME_P_ int fin)
5780{ 5836{
5781 scheme_load_named_file (SCHEME_A_ fin, 0); 5837 scheme_load_named_file (SCHEME_A_ fin, 0);
5782} 5838}
5783 5839
5784void 5840ecb_cold void
5785scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 5841scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5786{ 5842{
5787 dump_stack_reset (SCHEME_A); 5843 dump_stack_reset (SCHEME_A);
5788 SCHEME_V->envir = SCHEME_V->global_env; 5844 SCHEME_V->envir = SCHEME_V->global_env;
5789 SCHEME_V->file_i = 0; 5845 SCHEME_V->file_i = 0;
… …
5816 5872
5817 if (SCHEME_V->retcode == 0) 5873 if (SCHEME_V->retcode == 0)
5818 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5874 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5819} 5875}
5820 5876
5821void 5877ecb_cold void
5822scheme_load_string (SCHEME_P_ const char *cmd) 5878scheme_load_string (SCHEME_P_ const char *cmd)
5823{ 5879{
5824 dump_stack_reset (SCHEME_A); 5880 dump_stack_reset (SCHEME_A);
5825 SCHEME_V->envir = SCHEME_V->global_env; 5881 SCHEME_V->envir = SCHEME_V->global_env;
5826 SCHEME_V->file_i = 0; 5882 SCHEME_V->file_i = 0;
… …
5840 5896
5841 if (SCHEME_V->retcode == 0) 5897 if (SCHEME_V->retcode == 0)
5842 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5898 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5843} 5899}
5844 5900
5845void 5901ecb_cold void
5846scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 5902scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5847{ 5903{
5848 pointer x; 5904 pointer x;
5849 5905
5850 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 5906 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5855 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 5911 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5856} 5912}
5857 5913
5858#if !STANDALONE 5914#if !STANDALONE
5859 5915
5860void 5916ecb_cold void
5861scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 5917scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5862{ 5918{
5863 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));
5864} 5920}
5865 5921
5866void 5922ecb_cold void
5867scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 5923scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5868{ 5924{
5869 int i; 5925 int i;
5870 5926
5871 for (i = 0; i < count; i++) 5927 for (i = 0; i < count; i++)
5872 scheme_register_foreign_func (SCHEME_A_ list + i); 5928 scheme_register_foreign_func (SCHEME_A_ list + i);
5873} 5929}
5874 5930
5875pointer 5931ecb_cold pointer
5876scheme_apply0 (SCHEME_P_ const char *procname) 5932scheme_apply0 (SCHEME_P_ const char *procname)
5877{ 5933{
5878 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));
5879} 5935}
5880 5936
5881void 5937ecb_cold void
5882save_from_C_call (SCHEME_P) 5938save_from_C_call (SCHEME_P)
5883{ 5939{
5884 pointer saved_data = cons (car (S_SINK), 5940 pointer saved_data = cons (car (S_SINK),
5885 cons (SCHEME_V->envir, 5941 cons (SCHEME_V->envir,
5886 SCHEME_V->dump)); 5942 SCHEME_V->dump));
… …
5890 /* 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
5891 directly resume pre-C-call operations. */ 5947 directly resume pre-C-call operations. */
5892 dump_stack_reset (SCHEME_A); 5948 dump_stack_reset (SCHEME_A);
5893} 5949}
5894 5950
5895void 5951ecb_cold void
5896restore_from_C_call (SCHEME_P) 5952restore_from_C_call (SCHEME_P)
5897{ 5953{
5898 set_car (S_SINK, caar (SCHEME_V->c_nest)); 5954 set_car (S_SINK, caar (SCHEME_V->c_nest));
5899 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 5955 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5900 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 5956 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5901 /* Pop */ 5957 /* Pop */
5902 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 5958 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5903} 5959}
5904 5960
5905/* "func" and "args" are assumed to be already eval'ed. */ 5961/* "func" and "args" are assumed to be already eval'ed. */
5906pointer 5962ecb_cold pointer
5907scheme_call (SCHEME_P_ pointer func, pointer args) 5963scheme_call (SCHEME_P_ pointer func, pointer args)
5908{ 5964{
5909 int old_repl = SCHEME_V->interactive_repl; 5965 int old_repl = SCHEME_V->interactive_repl;
5910 5966
5911 SCHEME_V->interactive_repl = 0; 5967 SCHEME_V->interactive_repl = 0;
… …
5918 SCHEME_V->interactive_repl = old_repl; 5974 SCHEME_V->interactive_repl = old_repl;
5919 restore_from_C_call (SCHEME_A); 5975 restore_from_C_call (SCHEME_A);
5920 return SCHEME_V->value; 5976 return SCHEME_V->value;
5921} 5977}
5922 5978
5923pointer 5979ecb_cold pointer
5924scheme_eval (SCHEME_P_ pointer obj) 5980scheme_eval (SCHEME_P_ pointer obj)
5925{ 5981{
5926 int old_repl = SCHEME_V->interactive_repl; 5982 int old_repl = SCHEME_V->interactive_repl;
5927 5983
5928 SCHEME_V->interactive_repl = 0; 5984 SCHEME_V->interactive_repl = 0;
… …
5940 5996
5941/* ========== Main ========== */ 5997/* ========== Main ========== */
5942 5998
5943#if STANDALONE 5999#if STANDALONE
5944 6000
5945int 6001ecb_cold int
5946main (int argc, char **argv) 6002main (int argc, char **argv)
5947{ 6003{
5948# if USE_MULTIPLICITY 6004# if USE_MULTIPLICITY
5949 scheme ssc; 6005 scheme ssc;
5950 scheme *const SCHEME_V = &ssc; 6006 scheme *const SCHEME_V = &ssc;
… …
5952# endif 6008# endif
5953 int fin; 6009 int fin;
5954 char *file_name = InitFile; 6010 char *file_name = InitFile;
5955 int retcode; 6011 int retcode;
5956 int isfile = 1; 6012 int isfile = 1;
6013 system ("ps v $PPID");//D
5957 6014
5958 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6015 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5959 { 6016 {
5960 xwrstr ("Usage: tinyscheme -?\n"); 6017 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5961 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6018 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5962 xwrstr ("followed by\n"); 6019 putstr (SCHEME_A_ "followed by\n");
5963 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6020 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5964 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6021 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5965 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6022 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5966 xwrstr ("Use - as filename for stdin.\n"); 6023 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5967 return 1; 6024 return 1;
5968 } 6025 }
5969 6026
5970 if (!scheme_init (SCHEME_A)) 6027 if (!scheme_init (SCHEME_A))
5971 { 6028 {
5972 xwrstr ("Could not initialize!\n"); 6029 putstr (SCHEME_A_ "Could not initialize!\n");
5973 return 2; 6030 return 2;
5974 } 6031 }
5975 6032
5976# if USE_PORTS 6033# if USE_PORTS
5977 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6034 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6022 fin = open (file_name, O_RDONLY); 6079 fin = open (file_name, O_RDONLY);
6023#endif 6080#endif
6024 6081
6025 if (isfile && fin < 0) 6082 if (isfile && fin < 0)
6026 { 6083 {
6027 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");
6028 } 6085 }
6029 else 6086 else
6030 { 6087 {
6031 if (isfile) 6088 if (isfile)
6032 scheme_load_named_file (SCHEME_A_ fin, file_name); 6089 scheme_load_named_file (SCHEME_A_ fin, file_name);
… …
6036#if USE_PORTS 6093#if USE_PORTS
6037 if (!isfile || fin != STDIN_FILENO) 6094 if (!isfile || fin != STDIN_FILENO)
6038 { 6095 {
6039 if (SCHEME_V->retcode != 0) 6096 if (SCHEME_V->retcode != 0)
6040 { 6097 {
6041 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");
6042 } 6099 }
6043 6100
6044 if (isfile) 6101 if (isfile)
6045 close (fin); 6102 close (fin);
6046 } 6103 }

Diff Legend

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