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.19 by root, Thu Nov 26 21:36:11 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>
28#endif 32#endif
29#if USE_MATH 33#if USE_MATH
30# include <math.h> 34# include <math.h>
31#endif 35#endif
32 36
37#include "ecb.h"
38
33#include <sys/types.h> 39#include <sys/types.h>
34#include <sys/stat.h> 40#include <sys/stat.h>
35#include <fcntl.h> 41#include <fcntl.h>
36 42
43#if !USE_ERROR_CHECKING
44# define NDEBUG
45#endif
46
47#include <assert.h>
48#include <stdlib.h>
37#include <string.h> 49#include <string.h>
38#include <stdlib.h>
39 50
40#include <limits.h> 51#include <limits.h>
41#include <inttypes.h> 52#include <inttypes.h>
42#include <float.h> 53#include <float.h>
43//#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
44 63
45enum { 64enum {
46 TOK_EOF, 65 TOK_EOF,
47 TOK_LPAREN, 66 TOK_LPAREN,
48 TOK_RPAREN, 67 TOK_RPAREN,
49 TOK_DOT, 68 TOK_DOT,
50 TOK_ATOM, 69 TOK_ATOM,
70 TOK_DOTATOM, /* atom name starting with '.' */
71 TOK_STRATOM, /* atom name enclosed in | */
51 TOK_QUOTE, 72 TOK_QUOTE,
52 TOK_DQUOTE, 73 TOK_DQUOTE,
53 TOK_BQUOTE, 74 TOK_BQUOTE,
54 TOK_COMMA, 75 TOK_COMMA,
55 TOK_ATMARK, 76 TOK_ATMARK,
… …
57 TOK_SHARP_CONST, 78 TOK_SHARP_CONST,
58 TOK_VEC 79 TOK_VEC
59}; 80};
60 81
61#define BACKQUOTE '`' 82#define BACKQUOTE '`'
62#define DELIMITERS "()\";\f\t\v\n\r " 83#define WHITESPACE " \t\r\n\v\f"
84#define DELIMITERS "()\";" WHITESPACE
63 85
64#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 86#define NIL POINTER (&SCHEME_V->xNIL)
65#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 87#define S_T POINTER (&SCHEME_V->xT)
66#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 88#define S_F POINTER (&SCHEME_V->xF)
67#define S_SINK (&SCHEME_V->xsink) 89#define S_SINK POINTER (&SCHEME_V->xsink)
68#define S_EOF (&SCHEME_V->xEOF_OBJ) 90#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
69
70/* should use libecb */
71#if __GNUC__ >= 4
72# define ecb_expect(expr,value) __builtin_expect ((expr),(value))
73# define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
74# define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
75#else
76# define ecb_expect_false(expr) !!(expr)
77# define ecb_expect_true(expr) !!(expr)
78#endif
79 91
80#if !USE_MULTIPLICITY 92#if !USE_MULTIPLICITY
81static scheme sc; 93static scheme sc;
82#endif 94#endif
83 95
84static void 96ecb_cold static void
85xbase (char *s, long n, int base) 97xbase (char *s, long n, int base)
86{ 98{
87 if (n < 0) 99 if (n < 0)
88 { 100 {
89 *s++ = '-'; 101 *s++ = '-';
… …
91 } 103 }
92 104
93 char *p = s; 105 char *p = s;
94 106
95 do { 107 do {
96 *p++ = '0' + n % base; 108 *p++ = "0123456789abcdef"[n % base];
97 n /= base; 109 n /= base;
98 } while (n); 110 } while (n);
99 111
100 *p-- = 0; 112 *p-- = 0;
101 113
… …
104 char x = *s; *s = *p; *p = x; 116 char x = *s; *s = *p; *p = x;
105 --p; ++s; 117 --p; ++s;
106 } 118 }
107} 119}
108 120
109static void 121ecb_cold static void
110xnum (char *s, long n) 122xnum (char *s, long n)
111{ 123{
112 xbase (s, n, 10); 124 xbase (s, n, 10);
113} 125}
114 126
115static void 127ecb_cold static void
116xwrstr (const char *s) 128putnum (SCHEME_P_ long n)
117{
118 write (1, s, strlen (s));
119}
120
121static void
122xwrnum (long n)
123{ 129{
124 char buf[64]; 130 char buf[64];
125 131
126 xnum (buf, n); 132 xnum (buf, n);
127 xwrstr (buf); 133 putstr (SCHEME_A_ buf);
128} 134}
129 135
130static char 136ecb_cold static char
131xtoupper (char c) 137xtoupper (char c)
132{ 138{
133 if (c >= 'a' && c <= 'z') 139 if (c >= 'a' && c <= 'z')
134 c -= 'a' - 'A'; 140 c -= 'a' - 'A';
135 141
136 return c; 142 return c;
137} 143}
138 144
139static char 145ecb_cold static char
140xtolower (char c) 146xtolower (char c)
141{ 147{
142 if (c >= 'A' && c <= 'Z') 148 if (c >= 'A' && c <= 'Z')
143 c += 'a' - 'A'; 149 c += 'a' - 'A';
144 150
145 return c; 151 return c;
146} 152}
147 153
148static int 154ecb_cold static int
149xisdigit (char c) 155xisdigit (char c)
150{ 156{
151 return c >= '0' && c <= '9'; 157 return c >= '0' && c <= '9';
152} 158}
153 159
154#define toupper(c) xtoupper (c) 160#define toupper(c) xtoupper (c)
155#define tolower(c) xtolower (c) 161#define tolower(c) xtolower (c)
156#define isdigit(c) xisdigit (c) 162#define isdigit(c) xisdigit (c)
157 163
158#if USE_STRLWR 164#if USE_IGNORECASE
159static const char * 165ecb_cold static const char *
160strlwr (char *s) 166xstrlwr (char *s)
161{ 167{
162 const char *p = s; 168 const char *p = s;
163 169
164 while (*s) 170 while (*s)
165 { 171 {
… …
167 s++; 173 s++;
168 } 174 }
169 175
170 return p; 176 return p;
171} 177}
172#endif
173 178
179#define stricmp(a,b) strcasecmp (a, b)
180#define strlwr(s) xstrlwr (s)
181
182#else
174#define stricmp(a,b) strcmp (a, b) 183# define stricmp(a,b) strcmp (a, b)
175#define strlwr(s) (s) 184# define strlwr(s) (s)
185#endif
176 186
177#ifndef prompt 187#ifndef prompt
178# define prompt "ts> " 188# define prompt "ts> "
179#endif 189#endif
180 190
181#ifndef InitFile 191#ifndef InitFile
182# define InitFile "init.scm" 192# define InitFile "init.scm"
183#endif 193#endif
184 194
185#ifndef FIRST_CELLSEGS
186# define FIRST_CELLSEGS 3
187#endif
188
189enum scheme_types 195enum scheme_types
190{ 196{
197 T_INTEGER,
198 T_CHARACTER,
191 T_FREE, 199 T_REAL,
192 T_STRING, 200 T_STRING,
193 T_NUMBER,
194 T_SYMBOL, 201 T_SYMBOL,
195 T_PROC, 202 T_PROC,
196 T_PAIR, 203 T_PAIR, /* also used for free cells */
197 T_CLOSURE, 204 T_CLOSURE,
205 T_MACRO,
198 T_CONTINUATION, 206 T_CONTINUATION,
199 T_FOREIGN, 207 T_FOREIGN,
200 T_CHARACTER,
201 T_PORT, 208 T_PORT,
202 T_VECTOR, 209 T_VECTOR,
203 T_MACRO,
204 T_PROMISE, 210 T_PROMISE,
205 T_ENVIRONMENT, 211 T_ENVIRONMENT,
206 /* one more... */ 212 /* one more... */
207 T_NUM_SYSTEM_TYPES 213 T_NUM_SYSTEM_TYPES
208}; 214};
… …
211#define T_SYNTAX 0x0010 217#define T_SYNTAX 0x0010
212#define T_IMMUTABLE 0x0020 218#define T_IMMUTABLE 0x0020
213#define T_ATOM 0x0040 /* only for gc */ 219#define T_ATOM 0x0040 /* only for gc */
214#define T_MARK 0x0080 /* only for gc */ 220#define T_MARK 0x0080 /* only for gc */
215 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
216enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV }; 248enum num_op { NUM_ADD, NUM_SUB, NUM_MUL, NUM_INTDIV };
217 249
218static num num_op (enum num_op op, num a, num b); 250static num num_op (enum num_op op, num a, num b);
219static num num_intdiv (num a, num b); 251static num num_intdiv (num a, num b);
220static num num_rem (num a, num b); 252static num num_rem (num a, num b);
221static num num_mod (num a, num b); 253static num num_mod (num a, num b);
222 254
223#if USE_MATH
224static double round_per_R5RS (double x);
225#endif
226static int is_zero_rvalue (RVALUE x); 255static int is_zero_rvalue (RVALUE x);
227
228static INLINE int
229num_is_integer (pointer p)
230{
231 return num_is_fixnum (p->object.number);
232}
233 256
234static num num_zero; 257static num num_zero;
235static num num_one; 258static num num_one;
236 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
237/* macros for cell operations */ 264/* macros for cell operations */
238#define typeflag(p) ((p)->flag + 0) 265#define typeflag(p) (CELL(p)->flag + 0)
239#define set_typeflag(p,v) ((p)->flag = (v)) 266#define set_typeflag(p,v) (CELL(p)->flag = (v))
240#define type(p) (typeflag (p) & T_MASKTYPE) 267#define type(p) (typeflag (p) & T_MASKTYPE)
241 268
242INTERFACE INLINE int 269INTERFACE int
243is_string (pointer p) 270is_string (pointer p)
244{ 271{
245 return type (p) == T_STRING; 272 return type (p) == T_STRING;
246} 273}
247 274
248#define strvalue(p) ((p)->object.string.svalue) 275#define strvalue(p) (CELL(p)->object.string.svalue)
249#define strlength(p) ((p)->object.string.length) 276#define strlength(p) (CELL(p)->object.string.length)
250 277
251INTERFACE int is_list (SCHEME_P_ pointer p);
252
253INTERFACE INLINE int 278INTERFACE int
254is_vector (pointer p) 279is_vector (pointer p)
255{ 280{
256 return type (p) == T_VECTOR; 281 return type (p) == T_VECTOR;
257} 282}
258 283
259#define vecvalue(p) ((p)->object.vector.vvalue) 284#define vecvalue(p) (CELL(p)->object.vector.vvalue)
260#define veclength(p) ((p)->object.vector.length) 285#define veclength(p) (CELL(p)->object.vector.length)
261INTERFACE void fill_vector (pointer vec, pointer obj); 286INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
262INTERFACE uint32_t vector_length (pointer vec);
263INTERFACE pointer vector_elem (pointer vec, uint32_t ielem); 287INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
264INTERFACE void set_vector_elem (pointer vec, uint32_t ielem, pointer a); 288INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
265 289
266INTERFACE uint32_t 290INTERFACE int
267vector_length (pointer vec) 291is_integer (pointer p)
268{ 292{
269 return vec->object.vector.length; 293 return type (p) == T_INTEGER;
270} 294}
271 295
296/* not the same as in scheme, where integers are (correctly :) reals */
272INTERFACE INLINE int 297INTERFACE int
298is_real (pointer p)
299{
300 return type (p) == T_REAL;
301}
302
303INTERFACE int
273is_number (pointer p) 304is_number (pointer p)
274{ 305{
275 return type (p) == T_NUMBER; 306 return is_integer (p) || is_real (p);
276} 307}
277 308
278INTERFACE INLINE int 309INTERFACE int
279is_integer (pointer p)
280{
281 if (!is_number (p))
282 return 0;
283
284 if (num_is_integer (p) || ivalue (p) == rvalue (p))
285 return 1;
286
287 return 0;
288}
289
290INTERFACE INLINE int
291is_real (pointer p)
292{
293 return is_number (p) && !num_is_fixnum (p->object.number);
294}
295
296INTERFACE INLINE int
297is_character (pointer p) 310is_character (pointer p)
298{ 311{
299 return type (p) == T_CHARACTER; 312 return type (p) == T_CHARACTER;
300} 313}
301 314
302INTERFACE INLINE char * 315INTERFACE char *
303string_value (pointer p) 316string_value (pointer p)
304{ 317{
305 return strvalue (p); 318 return strvalue (p);
306} 319}
307 320
308INLINE num
309nvalue (pointer p)
310{
311 return (p)->object.number;
312}
313
314static IVALUE
315num_get_ivalue (const num n)
316{
317 return num_is_fixnum (n) ? num_ivalue (n) : (IVALUE)num_rvalue (n);
318}
319
320static RVALUE
321num_get_rvalue (const num n)
322{
323 return num_is_fixnum (n) ? (RVALUE)num_ivalue (n) : num_rvalue (n);
324}
325
326INTERFACE IVALUE
327ivalue (pointer p)
328{
329 return num_get_ivalue (p->object.number);
330}
331
332INTERFACE RVALUE
333rvalue (pointer p)
334{
335 return num_get_rvalue (p->object.number);
336}
337
338#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
339#if USE_REAL 324#if USE_REAL
340# define rvalue_unchecked(p) ((p)->object.number.value.rvalue) 325#define rvalue_unchecked(p) CELL(p)->object.rvalue
341# define set_num_integer(p) (p)->object.number.is_fixnum=1; 326#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
342# define set_num_real(p) (p)->object.number.is_fixnum=0;
343#else 327#else
344# define rvalue_unchecked(p) ((p)->object.number.value.ivalue) 328#define rvalue_unchecked(p) CELL(p)->object.ivalue
345# define set_num_integer(p) 0 329#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
346# define set_num_real(p) 0
347#endif 330#endif
331
348INTERFACE long 332INTERFACE long
349charvalue (pointer p) 333charvalue (pointer p)
350{ 334{
351 return ivalue_unchecked (p); 335 return ivalue_unchecked (p);
352} 336}
353 337
338#define port(p) CELL(p)->object.port
339#define set_port(p,v) port(p) = (v)
354INTERFACE INLINE int 340INTERFACE int
355is_port (pointer p) 341is_port (pointer p)
356{ 342{
357 return type (p) == T_PORT; 343 return type (p) == T_PORT;
358} 344}
359 345
360INTERFACE INLINE int 346INTERFACE int
361is_inport (pointer p) 347is_inport (pointer p)
362{ 348{
363 return is_port (p) && p->object.port->kind & port_input; 349 return is_port (p) && port (p)->kind & port_input;
364} 350}
365 351
366INTERFACE INLINE int 352INTERFACE int
367is_outport (pointer p) 353is_outport (pointer p)
368{ 354{
369 return is_port (p) && p->object.port->kind & port_output; 355 return is_port (p) && port (p)->kind & port_output;
370} 356}
371 357
372INTERFACE INLINE int 358INTERFACE int
373is_pair (pointer p) 359is_pair (pointer p)
374{ 360{
375 return type (p) == T_PAIR; 361 return type (p) == T_PAIR;
376} 362}
377 363
378#define car(p) ((p)->object.cons.car + 0) 364#define car(p) (POINTER (CELL(p)->object.cons.car))
379#define cdr(p) ((p)->object.cons.cdr + 0) 365#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
380 366
381static pointer caar (pointer p) { return car (car (p)); } 367static pointer caar (pointer p) { return car (car (p)); }
382static pointer cadr (pointer p) { return car (cdr (p)); } 368static pointer cadr (pointer p) { return car (cdr (p)); }
383static pointer cdar (pointer p) { return cdr (car (p)); } 369static pointer cdar (pointer p) { return cdr (car (p)); }
384static pointer cddr (pointer p) { return cdr (cdr (p)); } 370static pointer cddr (pointer p) { return cdr (cdr (p)); }
… …
388static pointer cdaar (pointer p) { return cdr (car (car (p))); } 374static pointer cdaar (pointer p) { return cdr (car (car (p))); }
389 375
390INTERFACE void 376INTERFACE void
391set_car (pointer p, pointer q) 377set_car (pointer p, pointer q)
392{ 378{
393 p->object.cons.car = q; 379 CELL(p)->object.cons.car = CELL (q);
394} 380}
395 381
396INTERFACE void 382INTERFACE void
397set_cdr (pointer p, pointer q) 383set_cdr (pointer p, pointer q)
398{ 384{
399 p->object.cons.cdr = q; 385 CELL(p)->object.cons.cdr = CELL (q);
400} 386}
401 387
402INTERFACE pointer 388INTERFACE pointer
403pair_car (pointer p) 389pair_car (pointer p)
404{ 390{
… …
409pair_cdr (pointer p) 395pair_cdr (pointer p)
410{ 396{
411 return cdr (p); 397 return cdr (p);
412} 398}
413 399
414INTERFACE INLINE int 400INTERFACE int
415is_symbol (pointer p) 401is_symbol (pointer p)
416{ 402{
417 return type (p) == T_SYMBOL; 403 return type (p) == T_SYMBOL;
418} 404}
419 405
420INTERFACE INLINE char * 406INTERFACE char *
421symname (pointer p) 407symname (pointer p)
422{ 408{
423 return strvalue (car (p)); 409 return strvalue (p);
424} 410}
425 411
426#if USE_PLIST 412#if USE_PLIST
413#error plists are broken because symbols are no longer pairs
414#define symprop(p) cdr(p)
427SCHEME_EXPORT INLINE int 415SCHEME_EXPORT int
428hasprop (pointer p) 416hasprop (pointer p)
429{ 417{
430 return typeflag (p) & T_SYMBOL; 418 return typeflag (p) & T_SYMBOL;
431} 419}
432
433# define symprop(p) cdr(p)
434#endif 420#endif
435 421
436INTERFACE INLINE int 422INTERFACE int
437is_syntax (pointer p) 423is_syntax (pointer p)
438{ 424{
439 return typeflag (p) & T_SYNTAX; 425 return typeflag (p) & T_SYNTAX;
440} 426}
441 427
442INTERFACE INLINE int 428INTERFACE int
443is_proc (pointer p) 429is_proc (pointer p)
444{ 430{
445 return type (p) == T_PROC; 431 return type (p) == T_PROC;
446} 432}
447 433
448INTERFACE INLINE int 434INTERFACE int
449is_foreign (pointer p) 435is_foreign (pointer p)
450{ 436{
451 return type (p) == T_FOREIGN; 437 return type (p) == T_FOREIGN;
452} 438}
453 439
454INTERFACE INLINE char * 440INTERFACE char *
455syntaxname (pointer p) 441syntaxname (pointer p)
456{ 442{
457 return strvalue (car (p)); 443 return strvalue (p);
458} 444}
459 445
460#define procnum(p) ivalue (p) 446#define procnum(p) ivalue_unchecked (p)
461static const char *procname (pointer x); 447static const char *procname (pointer x);
462 448
463INTERFACE INLINE int 449INTERFACE int
464is_closure (pointer p) 450is_closure (pointer p)
465{ 451{
466 return type (p) == T_CLOSURE; 452 return type (p) == T_CLOSURE;
467} 453}
468 454
469INTERFACE INLINE int 455INTERFACE int
470is_macro (pointer p) 456is_macro (pointer p)
471{ 457{
472 return type (p) == T_MACRO; 458 return type (p) == T_MACRO;
473} 459}
474 460
475INTERFACE INLINE pointer 461INTERFACE pointer
476closure_code (pointer p) 462closure_code (pointer p)
477{ 463{
478 return car (p); 464 return car (p);
479} 465}
480 466
481INTERFACE INLINE pointer 467INTERFACE pointer
482closure_env (pointer p) 468closure_env (pointer p)
483{ 469{
484 return cdr (p); 470 return cdr (p);
485} 471}
486 472
487INTERFACE INLINE int 473INTERFACE int
488is_continuation (pointer p) 474is_continuation (pointer p)
489{ 475{
490 return type (p) == T_CONTINUATION; 476 return type (p) == T_CONTINUATION;
491} 477}
492 478
493#define cont_dump(p) cdr (p) 479#define cont_dump(p) cdr (p)
494#define set_cont_dump(p,v) set_cdr ((p), (v)) 480#define set_cont_dump(p,v) set_cdr ((p), (v))
495 481
496/* To do: promise should be forced ONCE only */ 482/* To do: promise should be forced ONCE only */
497INTERFACE INLINE int 483INTERFACE int
498is_promise (pointer p) 484is_promise (pointer p)
499{ 485{
500 return type (p) == T_PROMISE; 486 return type (p) == T_PROMISE;
501} 487}
502 488
503INTERFACE INLINE int 489INTERFACE int
504is_environment (pointer p) 490is_environment (pointer p)
505{ 491{
506 return type (p) == T_ENVIRONMENT; 492 return type (p) == T_ENVIRONMENT;
507} 493}
508 494
… …
514 500
515#define is_mark(p) (typeflag (p) & T_MARK) 501#define is_mark(p) (typeflag (p) & T_MARK)
516#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK) 502#define setmark(p) set_typeflag ((p), typeflag (p) | T_MARK)
517#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK) 503#define clrmark(p) set_typeflag ((p), typeflag (p) & ~T_MARK)
518 504
519INTERFACE INLINE int 505INTERFACE int
520is_immutable (pointer p) 506is_immutable (pointer p)
521{ 507{
522 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING; 508 return typeflag (p) & T_IMMUTABLE && USE_ERROR_CHECKING;
523} 509}
524 510
525INTERFACE INLINE void 511INTERFACE void
526setimmutable (pointer p) 512setimmutable (pointer p)
527{ 513{
528#if USE_ERROR_CHECKING 514#if USE_ERROR_CHECKING
529 set_typeflag (p, typeflag (p) | T_IMMUTABLE); 515 set_typeflag (p, typeflag (p) | T_IMMUTABLE);
530#endif 516#endif
531} 517}
532 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;
571}
572
533#if USE_CHAR_CLASSIFIERS 573#if USE_CHAR_CLASSIFIERS
534static INLINE int 574ecb_inline int
535Cisalpha (int c) 575Cisalpha (int c)
536{ 576{
537 return isascii (c) && isalpha (c); 577 return isascii (c) && isalpha (c);
538} 578}
539 579
540static INLINE int 580ecb_inline int
541Cisdigit (int c) 581Cisdigit (int c)
542{ 582{
543 return isascii (c) && isdigit (c); 583 return isascii (c) && isdigit (c);
544} 584}
545 585
546static INLINE int 586ecb_inline int
547Cisspace (int c) 587Cisspace (int c)
548{ 588{
549 return isascii (c) && isspace (c); 589 return isascii (c) && isspace (c);
550} 590}
551 591
552static INLINE int 592ecb_inline int
553Cisupper (int c) 593Cisupper (int c)
554{ 594{
555 return isascii (c) && isupper (c); 595 return isascii (c) && isupper (c);
556} 596}
557 597
558static INLINE int 598ecb_inline int
559Cislower (int c) 599Cislower (int c)
560{ 600{
561 return isascii (c) && islower (c); 601 return isascii (c) && islower (c);
562} 602}
563#endif 603#endif
… …
596 "gs", 636 "gs",
597 "rs", 637 "rs",
598 "us" 638 "us"
599}; 639};
600 640
601static int 641ecb_cold static int
602is_ascii_name (const char *name, int *pc) 642is_ascii_name (const char *name, int *pc)
603{ 643{
604 int i; 644 int i;
605 645
606 for (i = 0; i < 32; i++) 646 for (i = 0; i < 32; i++)
… …
624#endif 664#endif
625 665
626static int file_push (SCHEME_P_ const char *fname); 666static int file_push (SCHEME_P_ const char *fname);
627static void file_pop (SCHEME_P); 667static void file_pop (SCHEME_P);
628static int file_interactive (SCHEME_P); 668static int file_interactive (SCHEME_P);
629static INLINE int is_one_of (char *s, int c); 669ecb_inline int is_one_of (const char *s, int c);
630static int alloc_cellseg (SCHEME_P_ int n); 670static int alloc_cellseg (SCHEME_P);
631static INLINE pointer get_cell (SCHEME_P_ pointer a, pointer b); 671ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
632static void finalize_cell (SCHEME_P_ pointer a); 672static void finalize_cell (SCHEME_P_ pointer a);
633static int count_consecutive_cells (pointer x, int needed); 673static int count_consecutive_cells (pointer x, int needed);
634static 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);
635static pointer mk_number (SCHEME_P_ const num n); 675static pointer mk_number (SCHEME_P_ const num n);
636static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill); 676static char *store_string (SCHEME_P_ uint32_t len, const char *str, char fill);
… …
651static void mark (pointer a); 691static void mark (pointer a);
652static void gc (SCHEME_P_ pointer a, pointer b); 692static void gc (SCHEME_P_ pointer a, pointer b);
653static int basic_inchar (port *pt); 693static int basic_inchar (port *pt);
654static int inchar (SCHEME_P); 694static int inchar (SCHEME_P);
655static void backchar (SCHEME_P_ int c); 695static void backchar (SCHEME_P_ int c);
656static char *readstr_upto (SCHEME_P_ char *delim); 696static char *readstr_upto (SCHEME_P_ int skip, const char *delim);
657static pointer readstrexp (SCHEME_P); 697static pointer readstrexp (SCHEME_P_ char delim);
658static INLINE int skipspace (SCHEME_P); 698ecb_inline int skipspace (SCHEME_P);
659static int token (SCHEME_P); 699static int token (SCHEME_P);
660static void printslashstring (SCHEME_P_ char *s, int len); 700static void printslashstring (SCHEME_P_ char *s, int len);
661static 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);
662static void printatom (SCHEME_P_ pointer l, int f); 702static void printatom (SCHEME_P_ pointer l, int f);
663static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op); 703static pointer mk_proc (SCHEME_P_ enum scheme_opcodes op);
… …
667static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list); 707static pointer reverse_in_place (SCHEME_P_ pointer term, pointer list);
668static pointer revappend (SCHEME_P_ pointer a, pointer b); 708static pointer revappend (SCHEME_P_ pointer a, pointer b);
669static pointer ss_get_cont (SCHEME_P); 709static pointer ss_get_cont (SCHEME_P);
670static void ss_set_cont (SCHEME_P_ pointer cont); 710static void ss_set_cont (SCHEME_P_ pointer cont);
671static void dump_stack_mark (SCHEME_P); 711static void dump_stack_mark (SCHEME_P);
672static pointer opexe_0 (SCHEME_P_ enum scheme_opcodes op); 712static int opexe_0 (SCHEME_P_ enum scheme_opcodes op);
713static int opexe_1 (SCHEME_P_ enum scheme_opcodes op);
673static pointer opexe_2 (SCHEME_P_ enum scheme_opcodes op); 714static int opexe_2 (SCHEME_P_ enum scheme_opcodes op);
674static pointer opexe_r (SCHEME_P_ enum scheme_opcodes op);
675static pointer opexe_3 (SCHEME_P_ enum scheme_opcodes op); 715static int opexe_3 (SCHEME_P_ enum scheme_opcodes op);
676static pointer opexe_4 (SCHEME_P_ enum scheme_opcodes op); 716static int opexe_4 (SCHEME_P_ enum scheme_opcodes op);
677static pointer opexe_5 (SCHEME_P_ enum scheme_opcodes op); 717static int opexe_5 (SCHEME_P_ enum scheme_opcodes op);
678static pointer opexe_6 (SCHEME_P_ enum scheme_opcodes op); 718static int opexe_6 (SCHEME_P_ enum scheme_opcodes op);
679static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op); 719static void Eval_Cycle (SCHEME_P_ enum scheme_opcodes op);
680static void assign_syntax (SCHEME_P_ const char *name); 720static void assign_syntax (SCHEME_P_ const char *name);
681static int syntaxnum (pointer p); 721static int syntaxnum (pointer p);
682static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name); 722static void assign_proc (SCHEME_P_ enum scheme_opcodes, const char *name);
683 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
684static num 751static num
685num_op (enum num_op op, num a, num b) 752num_op (enum num_op op, num a, num b)
686{ 753{
687 num ret; 754 num ret;
688 755
689 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));
690 757
691 if (num_is_fixnum (ret)) 758 if (num_is_fixnum (ret))
692 { 759 {
693 IVALUE av = num_get_ivalue (a);
694 IVALUE bv = num_get_ivalue (b);
695
696 switch (op) 760 switch (op)
697 { 761 {
698 case NUM_ADD: av += bv; break; 762 case NUM_ADD: a.ivalue += b.ivalue; break;
699 case NUM_SUB: av -= bv; break; 763 case NUM_SUB: a.ivalue -= b.ivalue; break;
700 case NUM_MUL: av *= bv; break; 764 case NUM_MUL: a.ivalue *= b.ivalue; break;
701 case NUM_INTDIV: av /= bv; break; 765 case NUM_INTDIV: a.ivalue /= b.ivalue; break;
702 } 766 }
703 767
704 num_set_ivalue (ret, av); 768 num_set_ivalue (ret, a.ivalue);
705 } 769 }
770#if USE_REAL
706 else 771 else
707 { 772 {
708 RVALUE av = num_get_rvalue (a);
709 RVALUE bv = num_get_rvalue (b);
710
711 switch (op) 773 switch (op)
712 { 774 {
713 case NUM_ADD: av += bv; break; 775 case NUM_ADD: a.rvalue += b.rvalue; break;
714 case NUM_SUB: av -= bv; break; 776 case NUM_SUB: a.rvalue -= b.rvalue; break;
715 case NUM_MUL: av *= bv; break; 777 case NUM_MUL: a.rvalue *= b.rvalue; break;
716 case NUM_INTDIV: av /= bv; break; 778 case NUM_INTDIV: a.rvalue /= b.rvalue; break;
717 } 779 }
718 780
719 num_set_rvalue (ret, av); 781 num_set_rvalue (ret, a.rvalue);
720 } 782 }
783#endif
721 784
722 return ret; 785 return ret;
723} 786}
724 787
725static num 788static num
726num_div (num a, num b) 789num_div (num a, num b)
727{ 790{
728 num ret; 791 num ret;
729 792
730 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);
731 794
732 if (num_is_fixnum (ret)) 795 if (num_is_fixnum (ret))
733 num_set_ivalue (ret, num_get_ivalue (a) / num_get_ivalue (b)); 796 num_set_ivalue (ret, num_ivalue (a) / num_ivalue (b));
734 else 797 else
735 num_set_rvalue (ret, num_get_rvalue (a) / num_get_rvalue (b)); 798 num_set_rvalue (ret, num_rvalue (a) / num_rvalue (b));
736 799
737 return ret; 800 return ret;
738} 801}
739 802
740static num 803static num
… …
742{ 805{
743 num ret; 806 num ret;
744 long e1, e2, res; 807 long e1, e2, res;
745 808
746 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));
747 e1 = num_get_ivalue (a); 810 e1 = num_ivalue (a);
748 e2 = num_get_ivalue (b); 811 e2 = num_ivalue (b);
749 res = e1 % e2; 812 res = e1 % e2;
750 813
751 /* remainder should have same sign as second operand */ 814 /* remainder should have same sign as second operand */
752 if (res > 0) 815 if (res > 0)
753 { 816 {
… …
769{ 832{
770 num ret; 833 num ret;
771 long e1, e2, res; 834 long e1, e2, res;
772 835
773 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));
774 e1 = num_get_ivalue (a); 837 e1 = num_ivalue (a);
775 e2 = num_get_ivalue (b); 838 e2 = num_ivalue (b);
776 res = e1 % e2; 839 res = e1 % e2;
777 840
778 /* modulo should have same sign as second operand */ 841 /* modulo should have same sign as second operand */
779 if (res * e2 < 0) 842 if (res * e2 < 0)
780 res += e2; 843 res += e2;
781 844
782 num_set_ivalue (ret, res); 845 num_set_ivalue (ret, res);
783 return ret; 846 return ret;
784} 847}
785 848
786/* this completely disrespects NaNs */ 849/* this completely disrespects NaNs, but r5rs doesn't even allow NaNs */
787static int 850static int
788num_cmp (num a, num b) 851num_cmp (num a, num b)
789{ 852{
790 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b); 853 int is_fixnum = num_is_fixnum (a) && num_is_fixnum (b);
791 int ret; 854 int ret;
792 855
793 if (is_fixnum) 856 if (is_fixnum)
794 { 857 {
795 IVALUE av = num_get_ivalue (a); 858 IVALUE av = num_ivalue (a);
796 IVALUE bv = num_get_ivalue (b); 859 IVALUE bv = num_ivalue (b);
797 860
798 ret = av == bv ? 0 : av < bv ? -1 : +1; 861 ret = av == bv ? 0 : av < bv ? -1 : +1;
799 } 862 }
800 else 863 else
801 { 864 {
802 RVALUE av = num_get_rvalue (a); 865 RVALUE av = num_rvalue (a);
803 RVALUE bv = num_get_rvalue (b); 866 RVALUE bv = num_rvalue (b);
804 867
805 ret = av == bv ? 0 : av < bv ? -1 : +1; 868 ret = av == bv ? 0 : av < bv ? -1 : +1;
806 } 869 }
807 870
808 return ret; 871 return ret;
809} 872}
810
811#if USE_MATH
812
813/* Round to nearest. Round to even if midway */
814static double
815round_per_R5RS (double x)
816{
817 double fl = floor (x);
818 double ce = ceil (x);
819 double dfl = x - fl;
820 double dce = ce - x;
821
822 if (dfl > dce)
823 return ce;
824 else if (dfl < dce)
825 return fl;
826 else
827 {
828 if (fmod (fl, 2) == 0) /* I imagine this holds */
829 return fl;
830 else
831 return ce;
832 }
833}
834#endif
835 873
836static int 874static int
837is_zero_rvalue (RVALUE x) 875is_zero_rvalue (RVALUE x)
838{ 876{
877 return x == 0;
878#if 0
839#if USE_REAL 879#if USE_REAL
840 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */ 880 return x < DBL_MIN && x > -DBL_MIN; /* why the hate of denormals? this should be == 0. */
841#else 881#else
842 return x == 0; 882 return x == 0;
843#endif 883#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. */
924static INLINE pointer 930ecb_inline pointer
925get_cell_x (SCHEME_P_ pointer a, pointer b) 931get_cell_x (SCHEME_P_ pointer a, pointer b)
926{ 932{
927 if (ecb_expect_false (SCHEME_V->free_cell == NIL)) 933 if (ecb_expect_false (SCHEME_V->free_cell == NIL))
928 { 934 {
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
1012static INLINE void 1017ecb_inline void
1013ok_to_freely_gc (SCHEME_P) 1018ok_to_freely_gc (SCHEME_P)
1014{ 1019{
1015 set_car (S_SINK, NIL); 1020 set_car (S_SINK, NIL);
1016} 1021}
1017 1022
… …
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
1086static 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
1129static 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 */
2237static 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 */
2247static 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
2828static INLINE void 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
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
2878static 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
2885static 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
2917static 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
2923static 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
2929static 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 pointer 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;
… …
2977 code = cons (mk_string (SCHEME_A_ s), code); 3006 code = cons (mk_string (SCHEME_A_ s), code);
2978 setimmutable (car (code)); 3007 setimmutable (car (code));
2979 SCHEME_V->code = cons (slot_value_in_env (x), code); 3008 SCHEME_V->code = cons (slot_value_in_env (x), code);
2980 SCHEME_V->op = OP_EVAL; 3009 SCHEME_V->op = OP_EVAL;
2981 3010
2982 return S_T; 3011 return 0;
2983 } 3012 }
2984#endif 3013#endif
2985 3014
2986 if (a) 3015 if (a)
2987 SCHEME_V->args = cons (a, NIL); 3016 SCHEME_V->args = cons (a, NIL);
… …
2989 SCHEME_V->args = NIL; 3018 SCHEME_V->args = NIL;
2990 3019
2991 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args); 3020 SCHEME_V->args = cons (mk_string (SCHEME_A_ s), SCHEME_V->args);
2992 setimmutable (car (SCHEME_V->args)); 3021 setimmutable (car (SCHEME_V->args));
2993 SCHEME_V->op = OP_ERR0; 3022 SCHEME_V->op = OP_ERR0;
3023
2994 return S_T; 3024 return 0;
2995} 3025}
2996 3026
2997#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a) 3027#define Error_1(s, a) return xError_1(SCHEME_A_ USE_ERROR_CHECKING ? s : "", a)
2998#define Error_0(s) Error_1 (s, 0) 3028#define Error_0(s) Error_1 (s, 0)
2999 3029
3000/* Too small to turn into function */ 3030/* Too small to turn into function */
3001#define BEGIN do { 3031#define BEGIN do {
3002#define END } while (0) 3032#define END } while (0)
3003#define s_goto(a) BEGIN \ 3033#define s_goto(a) BEGIN \
3004 SCHEME_V->op = a; \ 3034 SCHEME_V->op = a; \
3005 return S_T; END 3035 return 0; END
3006 3036
3007#define s_return(a) return xs_return (SCHEME_A_ a) 3037#define s_return(a) return xs_return (SCHEME_A_ a)
3008 3038
3009#ifndef USE_SCHEME_STACK 3039#ifndef USE_SCHEME_STACK
3010 3040
… …
3017 pointer code; 3047 pointer code;
3018}; 3048};
3019 3049
3020# define STACK_GROWTH 3 3050# define STACK_GROWTH 3
3021 3051
3022static void 3052ecb_hot static void
3023s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3053s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3024{ 3054{
3025 int nframes = (uintptr_t)SCHEME_V->dump; 3055 int nframes = (uintptr_t)SCHEME_V->dump;
3026 struct dump_stack_frame *next_frame; 3056 struct dump_stack_frame *next_frame;
3027 3057
3028 /* enough room for the next frame? */ 3058 /* enough room for the next frame? */
3029 if (nframes >= SCHEME_V->dump_size) 3059 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3030 { 3060 {
3031 SCHEME_V->dump_size += STACK_GROWTH; 3061 SCHEME_V->dump_size += STACK_GROWTH;
3032 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);
3033 } 3063 }
3034 3064
… …
3040 next_frame->code = code; 3070 next_frame->code = code;
3041 3071
3042 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3072 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3043} 3073}
3044 3074
3045static pointer 3075static ecb_hot int
3046xs_return (SCHEME_P_ pointer a) 3076xs_return (SCHEME_P_ pointer a)
3047{ 3077{
3048 int nframes = (uintptr_t)SCHEME_V->dump; 3078 int nframes = (uintptr_t)SCHEME_V->dump;
3049 struct dump_stack_frame *frame; 3079 struct dump_stack_frame *frame;
3050 3080
3051 SCHEME_V->value = a; 3081 SCHEME_V->value = a;
3052 3082
3053 if (nframes <= 0) 3083 if (nframes <= 0)
3054 return NIL; 3084 return -1;
3055 3085
3056 frame = &SCHEME_V->dump_base[--nframes]; 3086 frame = &SCHEME_V->dump_base[--nframes];
3057 SCHEME_V->op = frame->op; 3087 SCHEME_V->op = frame->op;
3058 SCHEME_V->args = frame->args; 3088 SCHEME_V->args = frame->args;
3059 SCHEME_V->envir = frame->envir; 3089 SCHEME_V->envir = frame->envir;
3060 SCHEME_V->code = frame->code; 3090 SCHEME_V->code = frame->code;
3061 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3091 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3062 3092
3063 return S_T; 3093 return 0;
3064} 3094}
3065 3095
3066static INLINE void 3096ecb_cold void
3067dump_stack_reset (SCHEME_P) 3097dump_stack_reset (SCHEME_P)
3068{ 3098{
3069 /* 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 */
3070 SCHEME_V->dump = (pointer)+0; 3100 SCHEME_V->dump = (pointer)+0;
3071} 3101}
3072 3102
3073static INLINE void 3103ecb_cold void
3074dump_stack_initialize (SCHEME_P) 3104dump_stack_initialize (SCHEME_P)
3075{ 3105{
3076 SCHEME_V->dump_size = 0; 3106 SCHEME_V->dump_size = 0;
3077 SCHEME_V->dump_base = 0; 3107 SCHEME_V->dump_base = 0;
3078 dump_stack_reset (SCHEME_A); 3108 dump_stack_reset (SCHEME_A);
3079} 3109}
3080 3110
3081static void 3111ecb_cold static void
3082dump_stack_free (SCHEME_P) 3112dump_stack_free (SCHEME_P)
3083{ 3113{
3084 free (SCHEME_V->dump_base); 3114 free (SCHEME_V->dump_base);
3085 SCHEME_V->dump_base = 0; 3115 SCHEME_V->dump_base = 0;
3086 SCHEME_V->dump = (pointer)0; 3116 SCHEME_V->dump = (pointer)0;
3087 SCHEME_V->dump_size = 0; 3117 SCHEME_V->dump_size = 0;
3088} 3118}
3089 3119
3090static void 3120ecb_cold static void
3091dump_stack_mark (SCHEME_P) 3121dump_stack_mark (SCHEME_P)
3092{ 3122{
3093 int nframes = (uintptr_t)SCHEME_V->dump; 3123 int nframes = (uintptr_t)SCHEME_V->dump;
3094 int i; 3124 int i;
3095 3125
… …
3101 mark (frame->envir); 3131 mark (frame->envir);
3102 mark (frame->code); 3132 mark (frame->code);
3103 } 3133 }
3104} 3134}
3105 3135
3106static pointer 3136ecb_cold static pointer
3107ss_get_cont (SCHEME_P) 3137ss_get_cont (SCHEME_P)
3108{ 3138{
3109 int nframes = (uintptr_t)SCHEME_V->dump; 3139 int nframes = (uintptr_t)SCHEME_V->dump;
3110 int i; 3140 int i;
3111 3141
… …
3123 } 3153 }
3124 3154
3125 return cont; 3155 return cont;
3126} 3156}
3127 3157
3128static void 3158ecb_cold static void
3129ss_set_cont (SCHEME_P_ pointer cont) 3159ss_set_cont (SCHEME_P_ pointer cont)
3130{ 3160{
3131 int i = 0; 3161 int i = 0;
3132 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3162 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3133 3163
3134 while (cont != NIL) 3164 while (cont != NIL)
3135 { 3165 {
3136 frame->op = ivalue (car (cont)); cont = cdr (cont); 3166 frame->op = ivalue_unchecked (car (cont)); cont = cdr (cont);
3137 frame->args = car (cont) ; cont = cdr (cont); 3167 frame->args = car (cont) ; cont = cdr (cont);
3138 frame->envir = car (cont) ; cont = cdr (cont); 3168 frame->envir = car (cont) ; cont = cdr (cont);
3139 frame->code = car (cont) ; cont = cdr (cont); 3169 frame->code = car (cont) ; cont = cdr (cont);
3140 3170
3141 ++frame; 3171 ++frame;
3142 ++i; 3172 ++i;
3143 } 3173 }
3144 3174
3145 SCHEME_V->dump = (pointer)(uintptr_t)i; 3175 SCHEME_V->dump = (pointer)(uintptr_t)i;
3146} 3176}
3147 3177
3148#else 3178#else
3149 3179
3150static INLINE void 3180ecb_cold void
3151dump_stack_reset (SCHEME_P) 3181dump_stack_reset (SCHEME_P)
3152{ 3182{
3153 SCHEME_V->dump = NIL; 3183 SCHEME_V->dump = NIL;
3154} 3184}
3155 3185
3156static INLINE void 3186ecb_cold void
3157dump_stack_initialize (SCHEME_P) 3187dump_stack_initialize (SCHEME_P)
3158{ 3188{
3159 dump_stack_reset (SCHEME_A); 3189 dump_stack_reset (SCHEME_A);
3160} 3190}
3161 3191
3162static void 3192ecb_cold static void
3163dump_stack_free (SCHEME_P) 3193dump_stack_free (SCHEME_P)
3164{ 3194{
3165 SCHEME_V->dump = NIL; 3195 SCHEME_V->dump = NIL;
3166} 3196}
3167 3197
3168static pointer 3198ecb_hot static int
3169xs_return (SCHEME_P_ pointer a) 3199xs_return (SCHEME_P_ pointer a)
3170{ 3200{
3171 pointer dump = SCHEME_V->dump; 3201 pointer dump = SCHEME_V->dump;
3172 3202
3173 SCHEME_V->value = a; 3203 SCHEME_V->value = a;
3174 3204
3175 if (dump == NIL) 3205 if (dump == NIL)
3176 return NIL; 3206 return -1;
3177 3207
3178 SCHEME_V->op = ivalue (car (dump)); dump = cdr (dump); 3208 SCHEME_V->op = ivalue_unchecked (car (dump)); dump = cdr (dump);
3179 SCHEME_V->args = car (dump) ; dump = cdr (dump); 3209 SCHEME_V->args = car (dump) ; dump = cdr (dump);
3180 SCHEME_V->envir = car (dump) ; dump = cdr (dump); 3210 SCHEME_V->envir = car (dump) ; dump = cdr (dump);
3181 SCHEME_V->code = car (dump) ; dump = cdr (dump); 3211 SCHEME_V->code = car (dump) ; dump = cdr (dump);
3182 3212
3183 SCHEME_V->dump = dump; 3213 SCHEME_V->dump = dump;
3184 3214
3185 return S_T; 3215 return 0;
3186} 3216}
3187 3217
3188static void 3218ecb_hot static void
3189s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3219s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3190{ 3220{
3191 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3221 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3192 cons (args, 3222 cons (args,
3193 cons (SCHEME_V->envir, 3223 cons (SCHEME_V->envir,
3194 cons (code, 3224 cons (code,
3195 SCHEME_V->dump)))); 3225 SCHEME_V->dump))));
3196} 3226}
3197 3227
3198static void 3228ecb_cold static void
3199dump_stack_mark (SCHEME_P) 3229dump_stack_mark (SCHEME_P)
3200{ 3230{
3201 mark (SCHEME_V->dump); 3231 mark (SCHEME_V->dump);
3202} 3232}
3203 3233
3204static pointer 3234ecb_cold static pointer
3205ss_get_cont (SCHEME_P) 3235ss_get_cont (SCHEME_P)
3206{ 3236{
3207 return SCHEME_V->dump; 3237 return SCHEME_V->dump;
3208} 3238}
3209 3239
3210static void 3240ecb_cold static void
3211ss_set_cont (SCHEME_P_ pointer cont) 3241ss_set_cont (SCHEME_P_ pointer cont)
3212{ 3242{
3213 SCHEME_V->dump = cont; 3243 SCHEME_V->dump = cont;
3214} 3244}
3215 3245
3216#endif 3246#endif
3217 3247
3218#define s_retbool(tf) s_return ((tf) ? S_T : S_F) 3248#define s_retbool(tf) s_return ((tf) ? S_T : S_F)
3219 3249
3250#if EXPERIMENT
3220static pointer 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
3221opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3310opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3222{ 3311{
3223 pointer args = SCHEME_V->args; 3312 pointer args = SCHEME_V->args;
3224 pointer x, y; 3313 pointer x, y;
3225 3314
3226 switch (op) 3315 switch (op)
3227 { 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
3228 case OP_LOAD: /* load */ 3323 case OP_LOAD: /* load */
3229 if (file_interactive (SCHEME_A)) 3324 if (file_interactive (SCHEME_A))
3230 { 3325 {
3231 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3326 putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3232 //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)));
3233 } 3328 }
3234 3329
3235 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3330 if (!file_push (SCHEME_A_ strvalue (car (args))))
3236 Error_1 ("unable to open", car (args)); 3331 Error_1 ("unable to open", car (args));
3237 else 3332 else
… …
3241 } 3336 }
3242 3337
3243 case OP_T0LVL: /* top level */ 3338 case OP_T0LVL: /* top level */
3244 3339
3245 /* If we reached the end of file, this loop is done. */ 3340 /* If we reached the end of file, this loop is done. */
3246 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3341 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3247 { 3342 {
3248 if (SCHEME_V->file_i == 0) 3343 if (SCHEME_V->file_i == 0)
3249 { 3344 {
3250 SCHEME_V->args = NIL; 3345 SCHEME_V->args = NIL;
3251 s_goto (OP_QUIT); 3346 s_goto (OP_QUIT);
… …
3329#endif 3424#endif
3330 if (is_symbol (SCHEME_V->code)) /* symbol */ 3425 if (is_symbol (SCHEME_V->code)) /* symbol */
3331 { 3426 {
3332 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);
3333 3428
3334 if (x != NIL) 3429 if (x == NIL)
3335 s_return (slot_value_in_env (x));
3336 else
3337 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));
3338 } 3433 }
3339 else if (is_pair (SCHEME_V->code)) 3434 else if (is_pair (SCHEME_V->code))
3340 { 3435 {
3341 x = car (SCHEME_V->code); 3436 x = car (SCHEME_V->code);
3342 3437
… …
3355 } 3450 }
3356 else 3451 else
3357 s_return (SCHEME_V->code); 3452 s_return (SCHEME_V->code);
3358 3453
3359 case OP_E0ARGS: /* eval arguments */ 3454 case OP_E0ARGS: /* eval arguments */
3360 if (is_macro (SCHEME_V->value)) /* macro expansion */ 3455 if (ecb_expect_false (is_macro (SCHEME_V->value))) /* macro expansion */
3361 { 3456 {
3362 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL); 3457 s_save (SCHEME_A_ OP_DOMACRO, NIL, NIL);
3363 SCHEME_V->args = cons (SCHEME_V->code, NIL); 3458 SCHEME_V->args = cons (SCHEME_V->code, NIL);
3364 SCHEME_V->code = SCHEME_V->value; 3459 SCHEME_V->code = SCHEME_V->value;
3365 s_goto (OP_APPLY); 3460 s_goto (OP_APPLY);
… …
3392 3487
3393 case OP_TRACING: 3488 case OP_TRACING:
3394 { 3489 {
3395 int tr = SCHEME_V->tracing; 3490 int tr = SCHEME_V->tracing;
3396 3491
3397 SCHEME_V->tracing = ivalue (car (args)); 3492 SCHEME_V->tracing = ivalue_unchecked (car (args));
3398 s_return (mk_integer (SCHEME_A_ tr)); 3493 s_return (mk_integer (SCHEME_A_ tr));
3399 } 3494 }
3400 3495
3401#endif 3496#endif
3402 3497
… …
3419 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3514 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3420 else if (is_foreign (SCHEME_V->code)) 3515 else if (is_foreign (SCHEME_V->code))
3421 { 3516 {
3422 /* Keep nested calls from GC'ing the arglist */ 3517 /* Keep nested calls from GC'ing the arglist */
3423 push_recent_alloc (SCHEME_A_ args, NIL); 3518 push_recent_alloc (SCHEME_A_ args, NIL);
3424 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3519 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3425 3520
3426 s_return (x); 3521 s_return (x);
3427 } 3522 }
3428 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 */
3429 { 3524 {
… …
3466 3561
3467 case OP_DOMACRO: /* do macro */ 3562 case OP_DOMACRO: /* do macro */
3468 SCHEME_V->code = SCHEME_V->value; 3563 SCHEME_V->code = SCHEME_V->value;
3469 s_goto (OP_EVAL); 3564 s_goto (OP_EVAL);
3470 3565
3471#if 1
3472
3473 case OP_LAMBDA: /* lambda */ 3566 case OP_LAMBDA: /* lambda */
3474 /* 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
3475 set SCHEME_V->value fall thru */ 3568 set SCHEME_V->value fall thru */
3476 { 3569 {
3477 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);
… …
3483 SCHEME_V->code = slot_value_in_env (f); 3576 SCHEME_V->code = slot_value_in_env (f);
3484 s_goto (OP_APPLY); 3577 s_goto (OP_APPLY);
3485 } 3578 }
3486 3579
3487 SCHEME_V->value = SCHEME_V->code; 3580 SCHEME_V->value = SCHEME_V->code;
3488 /* Fallthru */
3489 } 3581 }
3582 /* Fallthru */
3490 3583
3491 case OP_LAMBDA1: 3584 case OP_LAMBDA1:
3492 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));
3493
3494#else
3495
3496 case OP_LAMBDA: /* lambda */
3497 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3498
3499#endif
3500 3586
3501 case OP_MKCLOSURE: /* make-closure */ 3587 case OP_MKCLOSURE: /* make-closure */
3502 x = car (args); 3588 x = car (args);
3503 3589
3504 if (car (x) == SCHEME_V->LAMBDA) 3590 if (car (x) == SCHEME_V->LAMBDA)
… …
3911 SCHEME_V->code = car (args); 3997 SCHEME_V->code = car (args);
3912 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);
3913 s_goto (OP_APPLY); 3999 s_goto (OP_APPLY);
3914 } 4000 }
3915 4001
3916 abort (); 4002 if (USE_ERROR_CHECKING) abort ();
3917} 4003}
3918 4004
3919static pointer 4005/* math, cxr */
4006ecb_hot static int
3920opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4007opexe_1 (SCHEME_P_ enum scheme_opcodes op)
3921{ 4008{
3922 pointer args = SCHEME_V->args; 4009 pointer args = SCHEME_V->args;
3923 pointer x = car (args); 4010 pointer x = car (args);
3924 num v; 4011 num v;
3925 4012
3926#if USE_MATH
3927 RVALUE dd;
3928#endif
3929
3930 switch (op) 4013 switch (op)
3931 { 4014 {
3932#if USE_MATH 4015#if USE_MATH
3933 case OP_INEX2EX: /* inexact->exact */ 4016 case OP_INEX2EX: /* inexact->exact */
3934 if (num_is_integer (x)) 4017 if (!is_integer (x))
3935 s_return (x); 4018 {
3936 else if (modf (rvalue_unchecked (x), &dd) == 0) 4019 RVALUE r = rvalue_unchecked (x);
3937 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4020
4021 if (r == (RVALUE)(IVALUE)r)
4022 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
3938 else 4023 else
3939 Error_1 ("inexact->exact: not integral:", x); 4024 Error_1 ("inexact->exact: not integral:", x);
4025 }
3940 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))));
3941 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))));
3942 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))))));
3943 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))));
3944 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))));
3945 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))));
3946 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))));
3947 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))));
3948 4043
3949 case OP_ATAN: 4044 case OP_ATAN:
4045 s_return (mk_real (SCHEME_A_
3950 if (cdr (args) == NIL) 4046 cdr (args) == NIL
3951 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4047 ? atan (rvalue (x))
3952 else 4048 : atan2 (rvalue (x), rvalue (cadr (args)))));
3953 {
3954 pointer y = cadr (args);
3955 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
3956 }
3957
3958 case OP_SQRT:
3959 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
3960 4049
3961 case OP_EXPT: 4050 case OP_EXPT:
3962 { 4051 {
3963 RVALUE result; 4052 RVALUE result;
3964 int real_result = 1; 4053 int real_result = 1;
3965 pointer y = cadr (args); 4054 pointer y = cadr (args);
3966 4055
3967 if (num_is_integer (x) && num_is_integer (y)) 4056 if (is_integer (x) && is_integer (y))
3968 real_result = 0; 4057 real_result = 0;
3969 4058
3970 /* This 'if' is an R5RS compatibility fix. */ 4059 /* This 'if' is an R5RS compatibility fix. */
3971 /* NOTE: Remove this 'if' fix for R6RS. */ 4060 /* NOTE: Remove this 'if' fix for R6RS. */
3972 if (rvalue (x) == 0 && rvalue (y) < 0) 4061 if (rvalue (x) == 0 && rvalue (y) < 0)
… …
3978 /* If the test fails, result is too big for integer. */ 4067 /* If the test fails, result is too big for integer. */
3979 if (!real_result) 4068 if (!real_result)
3980 { 4069 {
3981 long result_as_long = result; 4070 long result_as_long = result;
3982 4071
3983 if (result != (RVALUE) result_as_long) 4072 if (result != result_as_long)
3984 real_result = 1; 4073 real_result = 1;
3985 } 4074 }
3986 4075
3987 if (real_result) 4076 if (real_result)
3988 s_return (mk_real (SCHEME_A_ result)); 4077 s_return (mk_real (SCHEME_A_ result));
3989 else 4078 else
3990 s_return (mk_integer (SCHEME_A_ result)); 4079 s_return (mk_integer (SCHEME_A_ result));
3991 } 4080 }
3992
3993 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
3994 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
3995
3996 case OP_TRUNCATE:
3997 {
3998 RVALUE rvalue_of_x;
3999
4000 rvalue_of_x = rvalue (x);
4001
4002 if (rvalue_of_x > 0)
4003 s_return (mk_real (SCHEME_A_ floor (rvalue_of_x)));
4004 else
4005 s_return (mk_real (SCHEME_A_ ceil (rvalue_of_x)));
4006 }
4007
4008 case OP_ROUND:
4009 if (num_is_integer (x))
4010 s_return (x);
4011
4012 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4013#endif 4081#endif
4014 4082
4015 case OP_ADD: /* + */ 4083 case OP_ADD: /* + */
4016 v = num_zero; 4084 v = num_zero;
4017 4085
4018 for (x = args; x != NIL; x = cdr (x)) 4086 for (x = args; x != NIL; x = cdr (x))
4019 v = num_op ('+', v, nvalue (car (x))); 4087 v = num_op (NUM_ADD, v, nvalue (car (x)));
4020 4088
4021 s_return (mk_number (SCHEME_A_ v)); 4089 s_return (mk_number (SCHEME_A_ v));
4022 4090
4023 case OP_MUL: /* * */ 4091 case OP_MUL: /* * */
4024 v = num_one; 4092 v = num_one;
4025 4093
4026 for (x = args; x != NIL; x = cdr (x)) 4094 for (x = args; x != NIL; x = cdr (x))
4027 v = num_op ('+', v, nvalue (car (x))); 4095 v = num_op (NUM_MUL, v, nvalue (car (x)));
4028 4096
4029 s_return (mk_number (SCHEME_A_ v)); 4097 s_return (mk_number (SCHEME_A_ v));
4030 4098
4031 case OP_SUB: /* - */ 4099 case OP_SUB: /* - */
4032 if (cdr (args) == NIL) 4100 if (cdr (args) == NIL)
… …
4039 x = cdr (args); 4107 x = cdr (args);
4040 v = nvalue (car (args)); 4108 v = nvalue (car (args));
4041 } 4109 }
4042 4110
4043 for (; x != NIL; x = cdr (x)) 4111 for (; x != NIL; x = cdr (x))
4044 v = num_op ('+', v, nvalue (car (x))); 4112 v = num_op (NUM_SUB, v, nvalue (car (x)));
4045 4113
4046 s_return (mk_number (SCHEME_A_ v)); 4114 s_return (mk_number (SCHEME_A_ v));
4047 4115
4048 case OP_DIV: /* / */ 4116 case OP_DIV: /* / */
4049 if (cdr (args) == NIL) 4117 if (cdr (args) == NIL)
… …
4056 x = cdr (args); 4124 x = cdr (args);
4057 v = nvalue (car (args)); 4125 v = nvalue (car (args));
4058 } 4126 }
4059 4127
4060 for (; x != NIL; x = cdr (x)) 4128 for (; x != NIL; x = cdr (x))
4061 {
4062 if (!is_zero_rvalue (rvalue (car (x)))) 4129 if (!is_zero_rvalue (rvalue (car (x))))
4063 v = num_div (v, nvalue (car (x))); 4130 v = num_div (v, nvalue (car (x)));
4064 else 4131 else
4065 Error_0 ("/: division by zero"); 4132 Error_0 ("/: division by zero");
4066 }
4067 4133
4068 s_return (mk_number (SCHEME_A_ v)); 4134 s_return (mk_number (SCHEME_A_ v));
4069 4135
4070 case OP_INTDIV: /* quotient */ 4136 case OP_INTDIV: /* quotient */
4071 if (cdr (args) == NIL) 4137 if (cdr (args) == NIL)
… …
4080 } 4146 }
4081 4147
4082 for (; x != NIL; x = cdr (x)) 4148 for (; x != NIL; x = cdr (x))
4083 { 4149 {
4084 if (ivalue (car (x)) != 0) 4150 if (ivalue (car (x)) != 0)
4085 v = num_op ('/', v, nvalue (car (x))); 4151 v = num_op (NUM_INTDIV, v, nvalue (car (x)));
4086 else 4152 else
4087 Error_0 ("quotient: division by zero"); 4153 Error_0 ("quotient: division by zero");
4088 } 4154 }
4089 4155
4090 s_return (mk_number (SCHEME_A_ v)); 4156 s_return (mk_number (SCHEME_A_ v));
… …
4107 else 4173 else
4108 Error_0 ("modulo: division by zero"); 4174 Error_0 ("modulo: division by zero");
4109 4175
4110 s_return (mk_number (SCHEME_A_ v)); 4176 s_return (mk_number (SCHEME_A_ v));
4111 4177
4112 case OP_CAR: /* car */ 4178 /* the compiler will optimize this mess... */
4113 s_return (caar (args)); 4179 case OP_CAR: op_car: s_return (car (x));
4114 4180 case OP_CDR: op_cdr: s_return (cdr (x));
4115 case OP_CDR: /* cdr */ 4181 case OP_CAAR: op_caar: x = car (x); goto op_car;
4116 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;
4117 4209
4118 case OP_CONS: /* cons */ 4210 case OP_CONS: /* cons */
4119 set_cdr (args, cadr (args)); 4211 set_cdr (args, cadr (args));
4120 s_return (args); 4212 s_return (args);
4121 4213
… …
4136 } 4228 }
4137 else 4229 else
4138 Error_0 ("set-cdr!: unable to alter immutable pair"); 4230 Error_0 ("set-cdr!: unable to alter immutable pair");
4139 4231
4140 case OP_CHAR2INT: /* char->integer */ 4232 case OP_CHAR2INT: /* char->integer */
4141 s_return (mk_integer (SCHEME_A_ ivalue (x))); 4233 s_return (mk_integer (SCHEME_A_ ivalue_unchecked (x)));
4142 4234
4143 case OP_INT2CHAR: /* integer->char */ 4235 case OP_INT2CHAR: /* integer->char */
4144 s_return (mk_character (SCHEME_A_ ivalue (x))); 4236 s_return (mk_character (SCHEME_A_ ivalue_unchecked (x)));
4145 4237
4146 case OP_CHARUPCASE: 4238 case OP_CHARUPCASE:
4147 { 4239 {
4148 unsigned char c = ivalue (x); 4240 unsigned char c = ivalue_unchecked (x);
4149 c = toupper (c); 4241 c = toupper (c);
4150 s_return (mk_character (SCHEME_A_ c)); 4242 s_return (mk_character (SCHEME_A_ c));
4151 } 4243 }
4152 4244
4153 case OP_CHARDNCASE: 4245 case OP_CHARDNCASE:
4154 { 4246 {
4155 unsigned char c = ivalue (x); 4247 unsigned char c = ivalue_unchecked (x);
4156 c = tolower (c); 4248 c = tolower (c);
4157 s_return (mk_character (SCHEME_A_ c)); 4249 s_return (mk_character (SCHEME_A_ c));
4158 } 4250 }
4159 4251
4160 case OP_STR2SYM: /* string->symbol */ 4252 case OP_STR2SYM: /* string->symbol */
… …
4237 Error_1 ("atom->string: not an atom:", x); 4329 Error_1 ("atom->string: not an atom:", x);
4238 } 4330 }
4239 4331
4240 case OP_MKSTRING: /* make-string */ 4332 case OP_MKSTRING: /* make-string */
4241 { 4333 {
4242 int fill = ' '; 4334 int fill = cdr (args) != NIL ? charvalue (cadr (args)) : ' ';
4243 int len;
4244
4245 len = ivalue (x); 4335 int len = ivalue_unchecked (x);
4246
4247 if (cdr (args) != NIL)
4248 fill = charvalue (cadr (args));
4249 4336
4250 s_return (mk_empty_string (SCHEME_A_ len, fill)); 4337 s_return (mk_empty_string (SCHEME_A_ len, fill));
4251 } 4338 }
4252 4339
4253 case OP_STRLEN: /* string-length */ 4340 case OP_STRLEN: /* string-length */
4254 s_return (mk_integer (SCHEME_A_ strlength (x))); 4341 s_return (mk_integer (SCHEME_A_ strlength (x)));
4255 4342
4256 case OP_STRREF: /* string-ref */ 4343 case OP_STRREF: /* string-ref */
4257 { 4344 {
4258 char *str;
4259 int index;
4260
4261 str = strvalue (x); 4345 char *str = strvalue (x);
4262
4263 index = ivalue (cadr (args)); 4346 int index = ivalue_unchecked (cadr (args));
4264 4347
4265 if (index >= strlength (x)) 4348 if (index >= strlength (x))
4266 Error_1 ("string-ref: out of bounds:", cadr (args)); 4349 Error_1 ("string-ref: out of bounds:", cadr (args));
4267 4350
4268 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index])); 4351 s_return (mk_character (SCHEME_A_ ((unsigned char *)str)[index]));
4269 } 4352 }
4270 4353
4271 case OP_STRSET: /* string-set! */ 4354 case OP_STRSET: /* string-set! */
4272 { 4355 {
4273 char *str; 4356 char *str = strvalue (x);
4274 int index; 4357 int index = ivalue_unchecked (cadr (args));
4275 int c; 4358 int c;
4276 4359
4277 if (is_immutable (x)) 4360 if (is_immutable (x))
4278 Error_1 ("string-set!: unable to alter immutable string:", x); 4361 Error_1 ("string-set!: unable to alter immutable string:", x);
4279
4280 str = strvalue (x);
4281
4282 index = ivalue (cadr (args));
4283 4362
4284 if (index >= strlength (x)) 4363 if (index >= strlength (x))
4285 Error_1 ("string-set!: out of bounds:", cadr (args)); 4364 Error_1 ("string-set!: out of bounds:", cadr (args));
4286 4365
4287 c = charvalue (caddr (args)); 4366 c = charvalue (caddr (args));
… …
4308 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4387 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4309 4388
4310 s_return (newstr); 4389 s_return (newstr);
4311 } 4390 }
4312 4391
4313 case OP_SUBSTR: /* substring */ 4392 case OP_STRING_COPY: /* substring/string-copy */
4314 { 4393 {
4315 char *str; 4394 char *str = strvalue (x);
4316 int index0; 4395 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4317 int index1; 4396 int index1;
4318 int len; 4397 int len;
4319 4398
4320 str = strvalue (x);
4321
4322 index0 = ivalue (cadr (args));
4323
4324 if (index0 > strlength (x)) 4399 if (index0 > strlength (x))
4325 Error_1 ("substring: start out of bounds:", cadr (args)); 4400 Error_1 ("string->copy: start out of bounds:", cadr (args));
4326 4401
4327 if (cddr (args) != NIL) 4402 if (cddr (args) != NIL)
4328 { 4403 {
4329 index1 = ivalue (caddr (args)); 4404 index1 = ivalue_unchecked (caddr (args));
4330 4405
4331 if (index1 > strlength (x) || index1 < index0) 4406 if (index1 > strlength (x) || index1 < index0)
4332 Error_1 ("substring: end out of bounds:", caddr (args)); 4407 Error_1 ("string->copy: end out of bounds:", caddr (args));
4333 } 4408 }
4334 else 4409 else
4335 index1 = strlength (x); 4410 index1 = strlength (x);
4336 4411
4337 len = index1 - index0; 4412 len = index1 - index0;
4338 x = mk_empty_string (SCHEME_A_ len, ' '); 4413 x = mk_counted_string (SCHEME_A_ str + index0, len);
4339 memcpy (strvalue (x), str + index0, len);
4340 strvalue (x)[len] = 0;
4341 4414
4342 s_return (x); 4415 s_return (x);
4343 } 4416 }
4344 4417
4345 case OP_VECTOR: /* vector */ 4418 case OP_VECTOR: /* vector */
… …
4357 if (SCHEME_V->no_memory) 4430 if (SCHEME_V->no_memory)
4358 s_return (S_SINK); 4431 s_return (S_SINK);
4359#endif 4432#endif
4360 4433
4361 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++)
4362 set_vector_elem (vec, i, car (x)); 4435 vector_set (vec, i, car (x));
4363 4436
4364 s_return (vec); 4437 s_return (vec);
4365 } 4438 }
4366 4439
4367 case OP_MKVECTOR: /* make-vector */ 4440 case OP_MKVECTOR: /* make-vector */
4368 { 4441 {
4369 pointer fill = NIL; 4442 pointer fill = NIL;
4370 int len;
4371 pointer vec; 4443 pointer vec;
4372
4373 len = ivalue (x); 4444 int len = ivalue_unchecked (x);
4374 4445
4375 if (cdr (args) != NIL) 4446 if (cdr (args) != NIL)
4376 fill = cadr (args); 4447 fill = cadr (args);
4377 4448
4378 vec = mk_vector (SCHEME_A_ len); 4449 vec = mk_vector (SCHEME_A_ len);
… …
4381 if (SCHEME_V->no_memory) 4452 if (SCHEME_V->no_memory)
4382 s_return (S_SINK); 4453 s_return (S_SINK);
4383#endif 4454#endif
4384 4455
4385 if (fill != NIL) 4456 if (fill != NIL)
4386 fill_vector (vec, fill); 4457 fill_vector (vec, 0, fill);
4387 4458
4388 s_return (vec); 4459 s_return (vec);
4389 } 4460 }
4390 4461
4391 case OP_VECLEN: /* vector-length */ 4462 case OP_VECLEN: /* vector-length */
4392 s_return (mk_integer (SCHEME_A_ veclength (x))); 4463 s_return (mk_integer (SCHEME_A_ veclength (x)));
4393 4464
4465 case OP_VECRESIZE:
4466 vector_resize (x, ivalue_unchecked (cadr (args)), caddr (args));
4467 s_return (x);
4468
4394 case OP_VECREF: /* vector-ref */ 4469 case OP_VECREF: /* vector-ref */
4395 { 4470 {
4396 int index;
4397
4398 index = ivalue (cadr (args)); 4471 int index = ivalue_unchecked (cadr (args));
4399 4472
4400 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4473 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4401 Error_1 ("vector-ref: out of bounds:", cadr (args)); 4474 Error_1 ("vector-ref: out of bounds:", cadr (args));
4402 4475
4403 s_return (vector_elem (x, index)); 4476 s_return (vector_get (x, index));
4404 } 4477 }
4405 4478
4406 case OP_VECSET: /* vector-set! */ 4479 case OP_VECSET: /* vector-set! */
4407 { 4480 {
4408 int index; 4481 int index = ivalue_unchecked (cadr (args));
4409 4482
4410 if (is_immutable (x)) 4483 if (is_immutable (x))
4411 Error_1 ("vector-set!: unable to alter immutable vector:", x); 4484 Error_1 ("vector-set!: unable to alter immutable vector:", x);
4412 4485
4413 index = ivalue (cadr (args));
4414
4415 if (index >= veclength (car (args)) && USE_ERROR_CHECKING) 4486 if (index >= veclength (car (args)) && USE_ERROR_CHECKING)
4416 Error_1 ("vector-set!: out of bounds:", cadr (args)); 4487 Error_1 ("vector-set!: out of bounds:", cadr (args));
4417 4488
4418 set_vector_elem (x, index, caddr (args)); 4489 vector_set (x, index, caddr (args));
4419 s_return (x); 4490 s_return (x);
4420 } 4491 }
4421 } 4492 }
4422 4493
4423 return S_T; 4494 if (USE_ERROR_CHECKING) abort ();
4424} 4495}
4425 4496
4426INTERFACE int 4497/* relational ops */
4427is_list (SCHEME_P_ pointer a) 4498ecb_hot static int
4428{
4429 return list_length (SCHEME_A_ a) >= 0;
4430}
4431
4432/* Result is:
4433 proper list: length
4434 circular list: -1
4435 not even a pair: -2
4436 dotted list: -2 minus length before dot
4437*/
4438INTERFACE int
4439list_length (SCHEME_P_ pointer a)
4440{
4441 int i = 0;
4442 pointer slow, fast;
4443
4444 slow = fast = a;
4445
4446 while (1)
4447 {
4448 if (fast == NIL)
4449 return i;
4450
4451 if (!is_pair (fast))
4452 return -2 - i;
4453
4454 fast = cdr (fast);
4455 ++i;
4456
4457 if (fast == NIL)
4458 return i;
4459
4460 if (!is_pair (fast))
4461 return -2 - i;
4462
4463 ++i;
4464 fast = cdr (fast);
4465
4466 /* Safe because we would have already returned if `fast'
4467 encountered a non-pair. */
4468 slow = cdr (slow);
4469
4470 if (fast == slow)
4471 {
4472 /* the fast pointer has looped back around and caught up
4473 with the slow pointer, hence the structure is circular,
4474 not of finite length, and therefore not a list */
4475 return -1;
4476 }
4477 }
4478}
4479
4480static pointer
4481opexe_r (SCHEME_P_ enum scheme_opcodes op) 4499opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4482{ 4500{
4483 pointer x = SCHEME_V->args; 4501 pointer x = SCHEME_V->args;
4484 4502
4485 for (;;) 4503 for (;;)
4486 { 4504 {
… …
4506 } 4524 }
4507 4525
4508 s_return (S_T); 4526 s_return (S_T);
4509} 4527}
4510 4528
4511static pointer 4529/* predicates */
4530ecb_hot static int
4512opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4531opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4513{ 4532{
4514 pointer args = SCHEME_V->args; 4533 pointer args = SCHEME_V->args;
4515 pointer a = car (args); 4534 pointer a = car (args);
4516 pointer d = cdr (args); 4535 pointer d = cdr (args);
4517 int r; 4536 int r;
4518 4537
4519 switch (op) 4538 switch (op)
4520 { 4539 {
4521 case OP_NOT: /* not */ r = is_false (a) ; break; 4540 case OP_NOT: /* not */ r = is_false (a) ; break;
4522 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;
4523 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break; 4542 case OP_EOFOBJP: /* eof-object? */ r = a == S_EOF ; break;
4524 case OP_NULLP: /* null? */ r = a == NIL ; break; 4543 case OP_NULLP: /* null? */ r = a == NIL ; break;
4525 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;
4526 case OP_NUMBERP: /* number? */ r = is_number (a) ; break; 4546 case OP_NUMBERP: /* number? */ r = is_number (a) ; break;
4527 case OP_STRINGP: /* string? */ r = is_string (a) ; break; 4547 case OP_STRINGP: /* string? */ r = is_string (a) ; break;
4528 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break; 4548 case OP_INTEGERP: /* integer? */ r = is_integer (a) ; break;
4529 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 */
4530 case OP_CHARP: /* char? */ r = is_character (a) ; break; 4550 case OP_CHARP: /* char? */ r = is_character (a) ; break;
4531 4551
4532#if USE_CHAR_CLASSIFIERS 4552#if USE_CHAR_CLASSIFIERS
4533 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue (a)); break; 4553 case OP_CHARAP: /* char-alphabetic? */ r = Cisalpha (ivalue_unchecked (a)); break;
4534 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue (a)); break; 4554 case OP_CHARNP: /* char-numeric? */ r = Cisdigit (ivalue_unchecked (a)); break;
4535 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue (a)); break; 4555 case OP_CHARWP: /* char-whitespace? */ r = Cisspace (ivalue_unchecked (a)); break;
4536 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue (a)); break; 4556 case OP_CHARUP: /* char-upper-case? */ r = Cisupper (ivalue_unchecked (a)); break;
4537 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue (a)); break; 4557 case OP_CHARLP: /* char-lower-case? */ r = Cislower (ivalue_unchecked (a)); break;
4538#endif 4558#endif
4539 4559
4540#if USE_PORTS 4560#if USE_PORTS
4541 case OP_PORTP: /* port? */ r = is_port (a) ; break; 4561 case OP_PORTP: /* port? */ r = is_port (a) ; break;
4542 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break; 4562 case OP_INPORTP: /* input-port? */ r = is_inport (a) ; break;
… …
4562 } 4582 }
4563 4583
4564 s_retbool (r); 4584 s_retbool (r);
4565} 4585}
4566 4586
4567static pointer 4587/* promises, list ops, ports */
4588ecb_hot static int
4568opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4589opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4569{ 4590{
4570 pointer args = SCHEME_V->args; 4591 pointer args = SCHEME_V->args;
4571 pointer a = car (args); 4592 pointer a = car (args);
4572 pointer x, y; 4593 pointer x, y;
… …
4585 } 4606 }
4586 else 4607 else
4587 s_return (SCHEME_V->code); 4608 s_return (SCHEME_V->code);
4588 4609
4589 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4610 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4590 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4611 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4591 s_return (SCHEME_V->value); 4612 s_return (SCHEME_V->value);
4592 4613
4593#if USE_PORTS 4614#if USE_PORTS
4615
4616 case OP_EOF_OBJECT: /* eof-object */
4617 s_return (S_EOF);
4594 4618
4595 case OP_WRITE: /* write */ 4619 case OP_WRITE: /* write */
4596 case OP_DISPLAY: /* display */ 4620 case OP_DISPLAY: /* display */
4597 case OP_WRITE_CHAR: /* write-char */ 4621 case OP_WRITE_CHAR: /* write-char */
4598 if (is_pair (cdr (SCHEME_V->args))) 4622 if (is_pair (cdr (SCHEME_V->args)))
… …
4658 putstr (SCHEME_A_ "\n"); 4682 putstr (SCHEME_A_ "\n");
4659 4683
4660 if (SCHEME_V->interactive_repl) 4684 if (SCHEME_V->interactive_repl)
4661 s_goto (OP_T0LVL); 4685 s_goto (OP_T0LVL);
4662 else 4686 else
4663 return NIL; 4687 return -1;
4664 } 4688 }
4665 4689
4666 case OP_REVERSE: /* reverse */ 4690 case OP_REVERSE: /* reverse */
4667 s_return (reverse (SCHEME_A_ a)); 4691 s_return (reverse (SCHEME_A_ a));
4668 4692
… …
4725 4749
4726 case OP_QUIT: /* quit */ 4750 case OP_QUIT: /* quit */
4727 if (is_pair (args)) 4751 if (is_pair (args))
4728 SCHEME_V->retcode = ivalue (a); 4752 SCHEME_V->retcode = ivalue (a);
4729 4753
4730 return NIL; 4754 return -1;
4731 4755
4732 case OP_GC: /* gc */ 4756 case OP_GC: /* gc */
4733 gc (SCHEME_A_ NIL, NIL); 4757 gc (SCHEME_A_ NIL, NIL);
4734 s_return (S_T); 4758 s_return (S_T);
4735 4759
… …
4740 SCHEME_V->gc_verbose = (a != S_F); 4764 SCHEME_V->gc_verbose = (a != S_F);
4741 s_retbool (was); 4765 s_retbool (was);
4742 } 4766 }
4743 4767
4744 case OP_NEWSEGMENT: /* new-segment */ 4768 case OP_NEWSEGMENT: /* new-segment */
4769#if 0
4745 if (!is_pair (args) || !is_number (a)) 4770 if (!is_pair (args) || !is_number (a))
4746 Error_0 ("new-segment: argument must be a number"); 4771 Error_0 ("new-segment: argument must be a number");
4747 4772#endif
4748 alloc_cellseg (SCHEME_A_ (int)ivalue (a)); 4773 s_retbool (alloc_cellseg (SCHEME_A));
4749
4750 s_return (S_T);
4751 4774
4752 case OP_OBLIST: /* oblist */ 4775 case OP_OBLIST: /* oblist */
4753 s_return (oblist_all_symbols (SCHEME_A)); 4776 s_return (oblist_all_symbols (SCHEME_A));
4754 4777
4755#if USE_PORTS 4778#if USE_PORTS
… …
4782 break; 4805 break;
4783 } 4806 }
4784 4807
4785 p = port_from_filename (SCHEME_A_ strvalue (a), prop); 4808 p = port_from_filename (SCHEME_A_ strvalue (a), prop);
4786 4809
4787 if (p == NIL) 4810 s_return (p == NIL ? S_F : p);
4788 s_return (S_F);
4789
4790 s_return (p);
4791 } 4811 }
4792 4812
4793# if USE_STRING_PORTS 4813# if USE_STRING_PORTS
4794 4814
4795 case OP_OPEN_INSTRING: /* open-input-string */ 4815 case OP_OPEN_INSTRING: /* open-input-string */
… …
4810 } 4830 }
4811 4831
4812 p = port_from_string (SCHEME_A_ strvalue (a), 4832 p = port_from_string (SCHEME_A_ strvalue (a),
4813 strvalue (a) + strlength (a), prop); 4833 strvalue (a) + strlength (a), prop);
4814 4834
4815 if (p == NIL) 4835 s_return (p == NIL ? S_F : p);
4816 s_return (S_F);
4817
4818 s_return (p);
4819 } 4836 }
4820 4837
4821 case OP_OPEN_OUTSTRING: /* open-output-string */ 4838 case OP_OPEN_OUTSTRING: /* open-output-string */
4822 { 4839 {
4823 pointer p; 4840 pointer p;
4824 4841
4825 if (a == NIL) 4842 if (a == NIL)
4826 {
4827 p = port_from_scratch (SCHEME_A); 4843 p = port_from_scratch (SCHEME_A);
4828
4829 if (p == NIL)
4830 s_return (S_F);
4831 }
4832 else 4844 else
4833 {
4834 p = port_from_string (SCHEME_A_ strvalue (a), 4845 p = port_from_string (SCHEME_A_ strvalue (a),
4835 strvalue (a) + strlength (a), port_output); 4846 strvalue (a) + strlength (a), port_output);
4836 4847
4837 if (p == NIL) 4848 s_return (p == NIL ? S_F : p);
4838 s_return (S_F);
4839 }
4840
4841 s_return (p);
4842 } 4849 }
4843 4850
4844 case OP_GET_OUTSTRING: /* get-output-string */ 4851 case OP_GET_OUTSTRING: /* get-output-string */
4845 { 4852 {
4846 port *p; 4853 port *p = port (a);
4847 4854
4848 if ((p = a->object.port)->kind & port_string) 4855 if (p->kind & port_string)
4849 { 4856 {
4850 off_t size; 4857 off_t size;
4851 char *str; 4858 char *str;
4852 4859
4853 size = p->rep.string.curr - p->rep.string.start + 1; 4860 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4885 case OP_CURR_ENV: /* current-environment */ 4892 case OP_CURR_ENV: /* current-environment */
4886 s_return (SCHEME_V->envir); 4893 s_return (SCHEME_V->envir);
4887 4894
4888 } 4895 }
4889 4896
4890 abort (); 4897 if (USE_ERROR_CHECKING) abort ();
4891} 4898}
4892 4899
4893static pointer 4900/* reading */
4901ecb_cold static int
4894opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4902opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4895{ 4903{
4896 pointer args = SCHEME_V->args; 4904 pointer args = SCHEME_V->args;
4897 pointer x; 4905 pointer x;
4898 4906
… …
4958 int res; 4966 int res;
4959 4967
4960 if (is_pair (args)) 4968 if (is_pair (args))
4961 p = car (args); 4969 p = car (args);
4962 4970
4963 res = p->object.port->kind & port_string; 4971 res = port (p)->kind & port_string;
4964 4972
4965 s_retbool (res); 4973 s_retbool (res);
4966 } 4974 }
4967 4975
4968 case OP_SET_INPORT: /* set-input-port */ 4976 case OP_SET_INPORT: /* set-input-port */
… …
5027 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL); 5035 s_save (SCHEME_A_ OP_RDUQTSP, NIL, NIL);
5028 SCHEME_V->tok = token (SCHEME_A); 5036 SCHEME_V->tok = token (SCHEME_A);
5029 s_goto (OP_RDSEXPR); 5037 s_goto (OP_RDSEXPR);
5030 5038
5031 case TOK_ATOM: 5039 case TOK_ATOM:
5032 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)));
5033 5050
5034 case TOK_DQUOTE: 5051 case TOK_DQUOTE:
5035 x = readstrexp (SCHEME_A); 5052 x = readstrexp (SCHEME_A_ '"');
5036 5053
5037 if (x == S_F) 5054 if (x == S_F)
5038 Error_0 ("Error reading string"); 5055 Error_0 ("Error reading string");
5039 5056
5040 setimmutable (x); 5057 setimmutable (x);
… …
5052 s_goto (OP_EVAL); 5069 s_goto (OP_EVAL);
5053 } 5070 }
5054 } 5071 }
5055 5072
5056 case TOK_SHARP_CONST: 5073 case TOK_SHARP_CONST:
5057 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)
5058 Error_0 ("undefined sharp expression"); 5075 Error_0 ("undefined sharp expression");
5059 else 5076 else
5060 s_return (x); 5077 s_return (x);
5061 5078
5062 default: 5079 default:
… …
5214 putstr (SCHEME_A_ ")"); 5231 putstr (SCHEME_A_ ")");
5215 s_return (S_T); 5232 s_return (S_T);
5216 } 5233 }
5217 else 5234 else
5218 { 5235 {
5219 pointer elem = vector_elem (vec, i); 5236 pointer elem = vector_get (vec, i);
5220 5237
5221 ivalue_unchecked (cdr (args)) = i + 1; 5238 ivalue_unchecked (cdr (args)) = i + 1;
5222 s_save (SCHEME_A_ OP_PVECFROM, args, NIL); 5239 s_save (SCHEME_A_ OP_PVECFROM, args, NIL);
5223 SCHEME_V->args = elem; 5240 SCHEME_V->args = elem;
5224 5241
… …
5228 s_goto (OP_P0LIST); 5245 s_goto (OP_P0LIST);
5229 } 5246 }
5230 } 5247 }
5231 } 5248 }
5232 5249
5233 abort (); 5250 if (USE_ERROR_CHECKING) abort ();
5234} 5251}
5235 5252
5236static pointer 5253/* list ops */
5254ecb_hot static int
5237opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5255opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5238{ 5256{
5239 pointer args = SCHEME_V->args; 5257 pointer args = SCHEME_V->args;
5240 pointer a = car (args); 5258 pointer a = car (args);
5241 pointer x, y; 5259 pointer x, y;
… …
5284 5302
5285 case OP_CLOSUREP: /* closure? */ 5303 case OP_CLOSUREP: /* closure? */
5286 /* 5304 /*
5287 * Note, macro object is also a closure. 5305 * Note, macro object is also a closure.
5288 * Therefore, (closure? <#MACRO>) ==> #t 5306 * Therefore, (closure? <#MACRO>) ==> #t
5307 * (schmorp) well, obviously not, fix? TODO
5289 */ 5308 */
5290 s_retbool (is_closure (a)); 5309 s_retbool (is_closure (a));
5291 5310
5292 case OP_MACROP: /* macro? */ 5311 case OP_MACROP: /* macro? */
5293 s_retbool (is_macro (a)); 5312 s_retbool (is_macro (a));
5294 } 5313 }
5295 5314
5296 abort (); 5315 if (USE_ERROR_CHECKING) abort ();
5297} 5316}
5298 5317
5318/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5299typedef pointer (*dispatch_func) (SCHEME_P_ enum scheme_opcodes); 5319typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5300 5320
5301typedef int (*test_predicate)(pointer); 5321typedef int (*test_predicate)(pointer);
5302static int 5322
5323ecb_hot static int
5303is_any (pointer p) 5324tst_any (pointer p)
5304{ 5325{
5305 return 1; 5326 return 1;
5306} 5327}
5307 5328
5308static int 5329ecb_hot static int
5309is_nonneg (pointer p) 5330tst_inonneg (pointer p)
5310{ 5331{
5311 return ivalue (p) >= 0 && is_integer (p); 5332 return is_integer (p) && ivalue_unchecked (p) >= 0;
5312} 5333}
5313 5334
5314static int 5335ecb_hot static int
5315tst_is_list (pointer p) 5336tst_is_list (SCHEME_P_ pointer p)
5316{ 5337{
5317 return p == NIL || is_pair (p); 5338 return p == NIL || is_pair (p);
5318} 5339}
5319 5340
5320/* Correspond carefully with following defines! */ 5341/* Correspond carefully with following defines! */
5321static struct 5342static struct
5322{ 5343{
5323 test_predicate fct; 5344 test_predicate fct;
5324 const char *kind; 5345 const char *kind;
5325} tests[] = 5346} tests[] = {
5326{
5327 { is_any, 0 }, 5347 { tst_any , 0 },
5328 { is_string, "string" }, 5348 { is_string , "string" },
5329 { is_symbol, "symbol" }, 5349 { is_symbol , "symbol" },
5330 { is_port, "port" }, 5350 { is_port , "port" },
5331 { is_inport, "input port" }, 5351 { is_inport , "input port" },
5332 { is_outport, "output port" }, 5352 { is_outport , "output port" },
5333 { is_environment, "environment" }, 5353 { is_environment, "environment" },
5334 { is_pair, "pair" }, 5354 { is_pair , "pair" },
5335 { tst_is_list, "pair or '()" }, 5355 { 0 , "pair or '()" },
5336 { is_character, "character" }, 5356 { is_character , "character" },
5337 { is_vector, "vector" }, 5357 { is_vector , "vector" },
5338 { is_number, "number" }, 5358 { is_number , "number" },
5339 { is_integer, "integer" }, 5359 { is_integer , "integer" },
5340 { is_nonneg, "non-negative integer" } 5360 { tst_inonneg , "non-negative integer" }
5341}; 5361};
5342 5362
5343#define TST_NONE 0 /* TST_NONE used for standard procedures, for internal ops, 0 is used */ 5363#define TST_NONE 0 /* TST_NONE used for built-ins, 0 for internal ops */
5344#define TST_ANY "\001" 5364#define TST_ANY "\001"
5345#define TST_STRING "\002" 5365#define TST_STRING "\002"
5346#define TST_SYMBOL "\003" 5366#define TST_SYMBOL "\003"
5347#define TST_PORT "\004" 5367#define TST_PORT "\004"
5348#define TST_INPORT "\005" 5368#define TST_INPORT "\005"
… …
5354#define TST_VECTOR "\013" 5374#define TST_VECTOR "\013"
5355#define TST_NUMBER "\014" 5375#define TST_NUMBER "\014"
5356#define TST_INTEGER "\015" 5376#define TST_INTEGER "\015"
5357#define TST_NATURAL "\016" 5377#define TST_NATURAL "\016"
5358 5378
5379#define INF_ARG 0xff
5380#define UNNAMED_OP ""
5381
5382static const char opnames[] =
5383#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5384#include "opdefines.h"
5385#undef OP_DEF
5386;
5387
5388ecb_cold static const char *
5389opname (int idx)
5390{
5391 const char *name = opnames;
5392
5393 /* should do this at compile time, but would require external program, right? */
5394 while (idx--)
5395 name += strlen (name) + 1;
5396
5397 return *name ? name : "ILLEGAL";
5398}
5399
5400ecb_cold static const char *
5401procname (pointer x)
5402{
5403 return opname (procnum (x));
5404}
5405
5359typedef struct 5406typedef struct
5360{ 5407{
5361 dispatch_func func; 5408 uint8_t func;
5362 char *name; 5409 /*dispatch_func func;*//*TODO: maybe optionally keep the pointer, for speed? */
5410 uint8_t builtin;
5411#if USE_ERROR_CHECKING
5363 int min_arity; 5412 uint8_t min_arity;
5364 int max_arity; 5413 uint8_t max_arity;
5365 char arg_tests_encoding[3]; 5414 char arg_tests_encoding[3];
5415#endif
5366} op_code_info; 5416} op_code_info;
5367 5417
5368#define INF_ARG 0xffff
5369
5370static op_code_info dispatch_table[] = { 5418static const op_code_info dispatch_table[] = {
5419#if USE_ERROR_CHECKING
5371#define OP_DEF(func,name,minarity,maxarity,argtest,op) { opexe_ ## func, name, 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
5372#include "opdefines.h" 5424#include "opdefines.h"
5373#undef OP_DEF 5425#undef OP_DEF
5374 {0} 5426 {0}
5375}; 5427};
5376 5428
5377static const char *
5378procname (pointer x)
5379{
5380 int n = procnum (x);
5381 const char *name = dispatch_table[n].name;
5382
5383 if (name == 0)
5384 name = "ILLEGAL!";
5385
5386 return name;
5387}
5388
5389/* kernel of this interpreter */ 5429/* kernel of this interpreter */
5390static void 5430ecb_hot static void
5391Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5431Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5392{ 5432{
5393 SCHEME_V->op = op; 5433 SCHEME_V->op = op;
5394 5434
5395 for (;;) 5435 for (;;)
5396 { 5436 {
5397 op_code_info *pcd = dispatch_table + SCHEME_V->op; 5437 const op_code_info *pcd = dispatch_table + SCHEME_V->op;
5398 5438
5399#if USE_ERROR_CHECKING 5439#if USE_ERROR_CHECKING
5400 if (pcd->name) /* if built-in function, check arguments */ 5440 if (pcd->builtin) /* if built-in function, check arguments */
5401 { 5441 {
5402 int ok = 1;
5403 char msg[STRBUFFSIZE]; 5442 char msg[STRBUFFSIZE];
5404 int n = list_length (SCHEME_A_ SCHEME_V->args); 5443 int n = list_length (SCHEME_A_ SCHEME_V->args);
5405 5444
5406 /* Check number of arguments */ 5445 /* Check number of arguments */
5407 if (ecb_expect_false (n < pcd->min_arity)) 5446 if (ecb_expect_false (n < pcd->min_arity))
5408 { 5447 {
5409 ok = 0;
5410 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5448 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5411 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity); 5449 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at least", pcd->min_arity);
5450 xError_1 (SCHEME_A_ msg, 0);
5451 continue;
5412 } 5452 }
5413 else if (ecb_expect_false (n > pcd->max_arity)) 5453 else if (ecb_expect_false (n > pcd->max_arity && pcd->max_arity != INF_ARG))
5414 { 5454 {
5415 ok = 0;
5416 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)", 5455 snprintf (msg, STRBUFFSIZE, "%s: needs%s %d argument(s)",
5417 pcd->name, pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity); 5456 opname (SCHEME_V->op), pcd->min_arity == pcd->max_arity ? "" : " at most", pcd->max_arity);
5457 xError_1 (SCHEME_A_ msg, 0);
5458 continue;
5418 } 5459 }
5419 5460 else
5420 if (ecb_expect_false (ok))
5421 { 5461 {
5422 if (*pcd->arg_tests_encoding) 5462 if (*pcd->arg_tests_encoding) /* literal 0 and TST_NONE treated the same */
5423 { 5463 {
5424 int i = 0; 5464 int i = 0;
5425 int j; 5465 int j;
5426 const char *t = pcd->arg_tests_encoding; 5466 const char *t = pcd->arg_tests_encoding;
5427 pointer arglist = SCHEME_V->args; 5467 pointer arglist = SCHEME_V->args;
… …
5430 { 5470 {
5431 pointer arg = car (arglist); 5471 pointer arg = car (arglist);
5432 5472
5433 j = t[0]; 5473 j = t[0];
5434 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 {
5435 if (!tests[j - 1].fct (arg)) 5483 if (!tests[j - 1].fct (arg))
5436 break; 5484 break;
5485 }
5437 5486
5438 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 */
5439 t++; 5488 t++;
5440 5489
5441 arglist = cdr (arglist); 5490 arglist = cdr (arglist);
5442 i++; 5491 i++;
5443 } 5492 }
5444 while (i < n); 5493 while (i < n);
5445 5494
5446 if (i < n) 5495 if (i < n)
5447 { 5496 {
5448 ok = 0;
5449 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", pcd->name, i + 1, tests[j].kind); 5497 snprintf (msg, STRBUFFSIZE, "%s: argument %d must be: %s", opname (SCHEME_V->op), i + 1, tests[j].kind);
5498 xError_1 (SCHEME_A_ msg, 0);
5499 continue;
5450 } 5500 }
5451 } 5501 }
5452 } 5502 }
5453
5454 if (!ok)
5455 {
5456 if (xError_1 (SCHEME_A_ msg, 0) == NIL)
5457 return;
5458
5459 pcd = dispatch_table + SCHEME_V->op;
5460 }
5461 } 5503 }
5462#endif 5504#endif
5463 5505
5464 ok_to_freely_gc (SCHEME_A); 5506 ok_to_freely_gc (SCHEME_A);
5465 5507
5508 static const dispatch_func dispatch_funcs[] = {
5509 opexe_0,
5510 opexe_1,
5511 opexe_2,
5512 opexe_3,
5513 opexe_4,
5514 opexe_5,
5515 opexe_6,
5516 };
5517
5466 if (ecb_expect_false (pcd->func (SCHEME_A_ SCHEME_V->op) == NIL)) 5518 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5467 return; 5519 return;
5468 5520
5469 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5521 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5470 { 5522 {
5471 xwrstr ("No memory!\n"); 5523 putstr (SCHEME_A_ "No memory!\n");
5472 return; 5524 return;
5473 } 5525 }
5474 } 5526 }
5475} 5527}
5476 5528
5477/* ========== Initialization of internal keywords ========== */ 5529/* ========== Initialization of internal keywords ========== */
5478 5530
5479static void 5531ecb_cold static void
5480assign_syntax (SCHEME_P_ const char *name) 5532assign_syntax (SCHEME_P_ const char *name)
5481{ 5533{
5482 pointer x = oblist_add_by_name (SCHEME_A_ name); 5534 pointer x = oblist_add_by_name (SCHEME_A_ name);
5483 set_typeflag (x, typeflag (x) | T_SYNTAX); 5535 set_typeflag (x, typeflag (x) | T_SYNTAX);
5484} 5536}
5485 5537
5486static void 5538ecb_cold static void
5487assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5539assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5488{ 5540{
5489 pointer x = mk_symbol (SCHEME_A_ name); 5541 pointer x = mk_symbol (SCHEME_A_ name);
5490 pointer y = mk_proc (SCHEME_A_ op); 5542 pointer y = mk_proc (SCHEME_A_ op);
5491 new_slot_in_env (SCHEME_A_ x, y); 5543 new_slot_in_env (SCHEME_A_ x, y);
… …
5495mk_proc (SCHEME_P_ enum scheme_opcodes op) 5547mk_proc (SCHEME_P_ enum scheme_opcodes op)
5496{ 5548{
5497 pointer y = get_cell (SCHEME_A_ NIL, NIL); 5549 pointer y = get_cell (SCHEME_A_ NIL, NIL);
5498 set_typeflag (y, (T_PROC | T_ATOM)); 5550 set_typeflag (y, (T_PROC | T_ATOM));
5499 ivalue_unchecked (y) = op; 5551 ivalue_unchecked (y) = op;
5500 set_num_integer (y);
5501 return y; 5552 return y;
5502} 5553}
5503 5554
5504/* 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! */
5505static int 5556ecb_hot static int
5506syntaxnum (pointer p) 5557syntaxnum (pointer p)
5507{ 5558{
5508 const char *s = strvalue (car (p)); 5559 const char *s = strvalue (p);
5509 5560
5510 switch (strlength (car (p))) 5561 switch (strlength (p))
5511 { 5562 {
5512 case 2: 5563 case 2:
5513 if (s[0] == 'i') 5564 if (s[0] == 'i')
5514 return OP_IF0; /* if */ 5565 return OP_IF0; /* if */
5515 else 5566 else
… …
5570 return OP_C0STREAM; /* cons-stream */ 5621 return OP_C0STREAM; /* cons-stream */
5571 } 5622 }
5572} 5623}
5573 5624
5574#if USE_MULTIPLICITY 5625#if USE_MULTIPLICITY
5575scheme * 5626ecb_cold scheme *
5576scheme_init_new () 5627scheme_init_new ()
5577{ 5628{
5578 scheme *sc = malloc (sizeof (scheme)); 5629 scheme *sc = malloc (sizeof (scheme));
5579 5630
5580 if (!scheme_init (SCHEME_A)) 5631 if (!scheme_init (SCHEME_A))
… …
5585 else 5636 else
5586 return sc; 5637 return sc;
5587} 5638}
5588#endif 5639#endif
5589 5640
5590int 5641ecb_cold int
5591scheme_init (SCHEME_P) 5642scheme_init (SCHEME_P)
5592{ 5643{
5593 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5644 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5594 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));
5595 5652
5596 num_set_fixnum (num_zero, 1); 5653 num_set_fixnum (num_zero, 1);
5597 num_set_ivalue (num_zero, 0); 5654 num_set_ivalue (num_zero, 0);
5598 num_set_fixnum (num_one, 1); 5655 num_set_fixnum (num_one, 1);
5599 num_set_ivalue (num_one, 1); 5656 num_set_ivalue (num_one, 1);
… …
5611 SCHEME_V->save_inport = NIL; 5668 SCHEME_V->save_inport = NIL;
5612 SCHEME_V->loadport = NIL; 5669 SCHEME_V->loadport = NIL;
5613 SCHEME_V->nesting = 0; 5670 SCHEME_V->nesting = 0;
5614 SCHEME_V->interactive_repl = 0; 5671 SCHEME_V->interactive_repl = 0;
5615 5672
5616 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5673 if (!alloc_cellseg (SCHEME_A))
5617 { 5674 {
5618#if USE_ERROR_CHECKING 5675#if USE_ERROR_CHECKING
5619 SCHEME_V->no_memory = 1; 5676 SCHEME_V->no_memory = 1;
5620 return 0; 5677 return 0;
5621#endif 5678#endif
… …
5668 5725
5669 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i) 5726 for (i = 0; i < sizeof (syntax_names) / sizeof (*syntax_names); ++i)
5670 assign_syntax (SCHEME_A_ syntax_names[i]); 5727 assign_syntax (SCHEME_A_ syntax_names[i]);
5671 } 5728 }
5672 5729
5730 // TODO: should iterate via strlen, to avoid n² complexity
5673 for (i = 0; i < n; i++) 5731 for (i = 0; i < n; i++)
5674 if (dispatch_table[i].name != 0) 5732 if (dispatch_table[i].builtin)
5675 assign_proc (SCHEME_A_ i, dispatch_table[i].name); 5733 assign_proc (SCHEME_A_ i, opname (i));
5676 5734
5677 /* initialization of global pointers to special symbols */ 5735 /* initialization of global pointers to special symbols */
5678 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda"); 5736 SCHEME_V->LAMBDA = mk_symbol (SCHEME_A_ "lambda");
5679 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote"); 5737 SCHEME_V->QUOTE = mk_symbol (SCHEME_A_ "quote");
5680 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote"); 5738 SCHEME_V->QQUOTE = mk_symbol (SCHEME_A_ "quasiquote");
… …
5688 5746
5689 return !SCHEME_V->no_memory; 5747 return !SCHEME_V->no_memory;
5690} 5748}
5691 5749
5692#if USE_PORTS 5750#if USE_PORTS
5693void 5751ecb_cold void
5694scheme_set_input_port_file (SCHEME_P_ int fin) 5752scheme_set_input_port_file (SCHEME_P_ int fin)
5695{ 5753{
5696 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 5754 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5697} 5755}
5698 5756
5699void 5757ecb_cold void
5700scheme_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)
5701{ 5759{
5702 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);
5703} 5761}
5704 5762
5705void 5763ecb_cold void
5706scheme_set_output_port_file (SCHEME_P_ int fout) 5764scheme_set_output_port_file (SCHEME_P_ int fout)
5707{ 5765{
5708 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 5766 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5709} 5767}
5710 5768
5711void 5769ecb_cold void
5712scheme_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)
5713{ 5771{
5714 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);
5715} 5773}
5716#endif 5774#endif
5717 5775
5718void 5776ecb_cold void
5719scheme_set_external_data (SCHEME_P_ void *p) 5777scheme_set_external_data (SCHEME_P_ void *p)
5720{ 5778{
5721 SCHEME_V->ext_data = p; 5779 SCHEME_V->ext_data = p;
5722} 5780}
5723 5781
5724void 5782ecb_cold void
5725scheme_deinit (SCHEME_P) 5783scheme_deinit (SCHEME_P)
5726{ 5784{
5727 int i; 5785 int i;
5728 5786
5729#if SHOW_ERROR_LINE 5787#if SHOW_ERROR_LINE
… …
5771 } 5829 }
5772 } 5830 }
5773#endif 5831#endif
5774} 5832}
5775 5833
5776void 5834ecb_cold void
5777scheme_load_file (SCHEME_P_ int fin) 5835scheme_load_file (SCHEME_P_ int fin)
5778{ 5836{
5779 scheme_load_named_file (SCHEME_A_ fin, 0); 5837 scheme_load_named_file (SCHEME_A_ fin, 0);
5780} 5838}
5781 5839
5782void 5840ecb_cold void
5783scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 5841scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5784{ 5842{
5785 dump_stack_reset (SCHEME_A); 5843 dump_stack_reset (SCHEME_A);
5786 SCHEME_V->envir = SCHEME_V->global_env; 5844 SCHEME_V->envir = SCHEME_V->global_env;
5787 SCHEME_V->file_i = 0; 5845 SCHEME_V->file_i = 0;
… …
5814 5872
5815 if (SCHEME_V->retcode == 0) 5873 if (SCHEME_V->retcode == 0)
5816 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5874 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5817} 5875}
5818 5876
5819void 5877ecb_cold void
5820scheme_load_string (SCHEME_P_ const char *cmd) 5878scheme_load_string (SCHEME_P_ const char *cmd)
5821{ 5879{
5822 dump_stack_reset (SCHEME_A); 5880 dump_stack_reset (SCHEME_A);
5823 SCHEME_V->envir = SCHEME_V->global_env; 5881 SCHEME_V->envir = SCHEME_V->global_env;
5824 SCHEME_V->file_i = 0; 5882 SCHEME_V->file_i = 0;
… …
5838 5896
5839 if (SCHEME_V->retcode == 0) 5897 if (SCHEME_V->retcode == 0)
5840 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5898 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5841} 5899}
5842 5900
5843void 5901ecb_cold void
5844scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 5902scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5845{ 5903{
5846 pointer x; 5904 pointer x;
5847 5905
5848 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 5906 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5853 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 5911 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5854} 5912}
5855 5913
5856#if !STANDALONE 5914#if !STANDALONE
5857 5915
5858void 5916ecb_cold void
5859scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 5917scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5860{ 5918{
5861 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));
5862} 5920}
5863 5921
5864void 5922ecb_cold void
5865scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 5923scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5866{ 5924{
5867 int i; 5925 int i;
5868 5926
5869 for (i = 0; i < count; i++) 5927 for (i = 0; i < count; i++)
5870 scheme_register_foreign_func (SCHEME_A_ list + i); 5928 scheme_register_foreign_func (SCHEME_A_ list + i);
5871} 5929}
5872 5930
5873pointer 5931ecb_cold pointer
5874scheme_apply0 (SCHEME_P_ const char *procname) 5932scheme_apply0 (SCHEME_P_ const char *procname)
5875{ 5933{
5876 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));
5877} 5935}
5878 5936
5879void 5937ecb_cold void
5880save_from_C_call (SCHEME_P) 5938save_from_C_call (SCHEME_P)
5881{ 5939{
5882 pointer saved_data = cons (car (S_SINK), 5940 pointer saved_data = cons (car (S_SINK),
5883 cons (SCHEME_V->envir, 5941 cons (SCHEME_V->envir,
5884 SCHEME_V->dump)); 5942 SCHEME_V->dump));
… …
5888 /* 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
5889 directly resume pre-C-call operations. */ 5947 directly resume pre-C-call operations. */
5890 dump_stack_reset (SCHEME_A); 5948 dump_stack_reset (SCHEME_A);
5891} 5949}
5892 5950
5893void 5951ecb_cold void
5894restore_from_C_call (SCHEME_P) 5952restore_from_C_call (SCHEME_P)
5895{ 5953{
5896 set_car (S_SINK, caar (SCHEME_V->c_nest)); 5954 set_car (S_SINK, caar (SCHEME_V->c_nest));
5897 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 5955 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5898 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 5956 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5899 /* Pop */ 5957 /* Pop */
5900 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 5958 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5901} 5959}
5902 5960
5903/* "func" and "args" are assumed to be already eval'ed. */ 5961/* "func" and "args" are assumed to be already eval'ed. */
5904pointer 5962ecb_cold pointer
5905scheme_call (SCHEME_P_ pointer func, pointer args) 5963scheme_call (SCHEME_P_ pointer func, pointer args)
5906{ 5964{
5907 int old_repl = SCHEME_V->interactive_repl; 5965 int old_repl = SCHEME_V->interactive_repl;
5908 5966
5909 SCHEME_V->interactive_repl = 0; 5967 SCHEME_V->interactive_repl = 0;
… …
5916 SCHEME_V->interactive_repl = old_repl; 5974 SCHEME_V->interactive_repl = old_repl;
5917 restore_from_C_call (SCHEME_A); 5975 restore_from_C_call (SCHEME_A);
5918 return SCHEME_V->value; 5976 return SCHEME_V->value;
5919} 5977}
5920 5978
5921pointer 5979ecb_cold pointer
5922scheme_eval (SCHEME_P_ pointer obj) 5980scheme_eval (SCHEME_P_ pointer obj)
5923{ 5981{
5924 int old_repl = SCHEME_V->interactive_repl; 5982 int old_repl = SCHEME_V->interactive_repl;
5925 5983
5926 SCHEME_V->interactive_repl = 0; 5984 SCHEME_V->interactive_repl = 0;
… …
5938 5996
5939/* ========== Main ========== */ 5997/* ========== Main ========== */
5940 5998
5941#if STANDALONE 5999#if STANDALONE
5942 6000
5943int 6001ecb_cold int
5944main (int argc, char **argv) 6002main (int argc, char **argv)
5945{ 6003{
5946# if USE_MULTIPLICITY 6004# if USE_MULTIPLICITY
5947 scheme ssc; 6005 scheme ssc;
5948 scheme *const SCHEME_V = &ssc; 6006 scheme *const SCHEME_V = &ssc;
… …
5950# endif 6008# endif
5951 int fin; 6009 int fin;
5952 char *file_name = InitFile; 6010 char *file_name = InitFile;
5953 int retcode; 6011 int retcode;
5954 int isfile = 1; 6012 int isfile = 1;
6013 system ("ps v $PPID");//D
5955 6014
5956 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6015 if (argc == 2 && strcmp (argv[1], "-?") == 0)
5957 { 6016 {
5958 xwrstr ("Usage: tinyscheme -?\n"); 6017 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
5959 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6018 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
5960 xwrstr ("followed by\n"); 6019 putstr (SCHEME_A_ "followed by\n");
5961 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6020 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
5962 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6021 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
5963 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6022 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
5964 xwrstr ("Use - as filename for stdin.\n"); 6023 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
5965 return 1; 6024 return 1;
5966 } 6025 }
5967 6026
5968 if (!scheme_init (SCHEME_A)) 6027 if (!scheme_init (SCHEME_A))
5969 { 6028 {
5970 xwrstr ("Could not initialize!\n"); 6029 putstr (SCHEME_A_ "Could not initialize!\n");
5971 return 2; 6030 return 2;
5972 } 6031 }
5973 6032
5974# if USE_PORTS 6033# if USE_PORTS
5975 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6034 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6020 fin = open (file_name, O_RDONLY); 6079 fin = open (file_name, O_RDONLY);
6021#endif 6080#endif
6022 6081
6023 if (isfile && fin < 0) 6082 if (isfile && fin < 0)
6024 { 6083 {
6025 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");
6026 } 6085 }
6027 else 6086 else
6028 { 6087 {
6029 if (isfile) 6088 if (isfile)
6030 scheme_load_named_file (SCHEME_A_ fin, file_name); 6089 scheme_load_named_file (SCHEME_A_ fin, file_name);
… …
6034#if USE_PORTS 6093#if USE_PORTS
6035 if (!isfile || fin != STDIN_FILENO) 6094 if (!isfile || fin != STDIN_FILENO)
6036 { 6095 {
6037 if (SCHEME_V->retcode != 0) 6096 if (SCHEME_V->retcode != 0)
6038 { 6097 {
6039 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");
6040 } 6099 }
6041 6100
6042 if (isfile) 6101 if (isfile)
6043 close (fin); 6102 close (fin);
6044 } 6103 }

Diff Legend

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