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.47 by root, Mon Nov 30 09:25:19 2015 UTC vs.
Revision 1.60 by root, Wed Dec 2 02:59:36 2015 UTC

… …
18 * 18 *
19 */ 19 */
20 20
21#define EXPERIMENT 1 21#define EXPERIMENT 1
22 22
23#if 1
23#define PAGE_SIZE 4096 /* does not work on sparc/alpha */ 24#define PAGE_SIZE 4096 /* does not work on sparc/alpha */
24#include "malloc.c" 25#include "malloc.c"
26#endif
25 27
26#define SCHEME_SOURCE 28#define SCHEME_SOURCE
27#include "scheme-private.h" 29#include "scheme-private.h"
28#ifndef WIN32 30#ifndef WIN32
29# include <unistd.h> 31# include <unistd.h>
… …
79 81
80#define BACKQUOTE '`' 82#define BACKQUOTE '`'
81#define WHITESPACE " \t\r\n\v\f" 83#define WHITESPACE " \t\r\n\v\f"
82#define DELIMITERS "()\";" WHITESPACE 84#define DELIMITERS "()\";" WHITESPACE
83 85
84#define NIL (&SCHEME_V->xNIL) //TODO: make this 0? 86#define NIL POINTER (&SCHEME_V->xNIL)
85#define S_T (&SCHEME_V->xT) //TODO: magic ptr value? 87#define S_T POINTER (&SCHEME_V->xT)
86#define S_F (&SCHEME_V->xF) //TODO: magic ptr value? 88#define S_F POINTER (&SCHEME_V->xF)
87#define S_SINK (&SCHEME_V->xsink) 89#define S_SINK POINTER (&SCHEME_V->xsink)
88#define S_EOF (&SCHEME_V->xEOF_OBJ) 90#define S_EOF POINTER (&SCHEME_V->xEOF_OBJ)
89 91
90#if !USE_MULTIPLICITY 92#if !USE_MULTIPLICITY
91static scheme sc; 93static scheme sc;
92#endif 94#endif
93 95
94static void 96ecb_cold static void
95xbase (char *s, long n, int base) 97xbase (char *s, long n, int base)
96{ 98{
97 if (n < 0) 99 if (n < 0)
98 { 100 {
99 *s++ = '-'; 101 *s++ = '-';
… …
101 } 103 }
102 104
103 char *p = s; 105 char *p = s;
104 106
105 do { 107 do {
106 *p++ = '0' + n % base; 108 *p++ = "0123456789abcdef"[n % base];
107 n /= base; 109 n /= base;
108 } while (n); 110 } while (n);
109 111
110 *p-- = 0; 112 *p-- = 0;
111 113
… …
114 char x = *s; *s = *p; *p = x; 116 char x = *s; *s = *p; *p = x;
115 --p; ++s; 117 --p; ++s;
116 } 118 }
117} 119}
118 120
119static void 121ecb_cold static void
120xnum (char *s, long n) 122xnum (char *s, long n)
121{ 123{
122 xbase (s, n, 10); 124 xbase (s, n, 10);
123} 125}
124 126
125static void 127ecb_cold static void
126xwrstr (const char *s) 128putnum (SCHEME_P_ long n)
127{
128 write (1, s, strlen (s));
129}
130
131static void
132xwrnum (long n)
133{ 129{
134 char buf[64]; 130 char buf[64];
135 131
136 xnum (buf, n); 132 xnum (buf, n);
137 xwrstr (buf); 133 putstr (SCHEME_A_ buf);
138} 134}
139 135
140static char 136ecb_cold static char
141xtoupper (char c) 137xtoupper (char c)
142{ 138{
143 if (c >= 'a' && c <= 'z') 139 if (c >= 'a' && c <= 'z')
144 c -= 'a' - 'A'; 140 c -= 'a' - 'A';
145 141
146 return c; 142 return c;
147} 143}
148 144
149static char 145ecb_cold static char
150xtolower (char c) 146xtolower (char c)
151{ 147{
152 if (c >= 'A' && c <= 'Z') 148 if (c >= 'A' && c <= 'Z')
153 c += 'a' - 'A'; 149 c += 'a' - 'A';
154 150
155 return c; 151 return c;
156} 152}
157 153
158static int 154ecb_cold static int
159xisdigit (char c) 155xisdigit (char c)
160{ 156{
161 return c >= '0' && c <= '9'; 157 return c >= '0' && c <= '9';
162} 158}
163 159
164#define toupper(c) xtoupper (c) 160#define toupper(c) xtoupper (c)
165#define tolower(c) xtolower (c) 161#define tolower(c) xtolower (c)
166#define isdigit(c) xisdigit (c) 162#define isdigit(c) xisdigit (c)
167 163
168#if USE_IGNORECASE 164#if USE_IGNORECASE
169static const char * 165ecb_cold static const char *
170xstrlwr (char *s) 166xstrlwr (char *s)
171{ 167{
172 const char *p = s; 168 const char *p = s;
173 169
174 while (*s) 170 while (*s)
… …
194 190
195#ifndef InitFile 191#ifndef InitFile
196# define InitFile "init.scm" 192# define InitFile "init.scm"
197#endif 193#endif
198 194
199#ifndef FIRST_CELLSEGS
200# define FIRST_CELLSEGS 3
201#endif
202
203enum scheme_types 195enum scheme_types
204{ 196{
205 T_INTEGER, 197 T_INTEGER,
198 T_CHARACTER,
206 T_REAL, 199 T_REAL,
207 T_STRING, 200 T_STRING,
208 T_SYMBOL, 201 T_SYMBOL,
209 T_PROC, 202 T_PROC,
210 T_PAIR, /* also used for free cells */ 203 T_PAIR, /* also used for free cells */
211 T_CLOSURE, 204 T_CLOSURE,
205 T_MACRO,
212 T_CONTINUATION, 206 T_CONTINUATION,
213 T_FOREIGN, 207 T_FOREIGN,
214 T_CHARACTER,
215 T_PORT, 208 T_PORT,
216 T_VECTOR, 209 T_VECTOR,
217 T_MACRO,
218 T_PROMISE, 210 T_PROMISE,
219 T_ENVIRONMENT, 211 T_ENVIRONMENT,
220 /* one more... */ 212 /* one more... */
221 T_NUM_SYSTEM_TYPES 213 T_NUM_SYSTEM_TYPES
222}; 214};
… …
258static num num_op (enum num_op op, num a, num b); 250static num num_op (enum num_op op, num a, num b);
259static num num_intdiv (num a, num b); 251static num num_intdiv (num a, num b);
260static num num_rem (num a, num b); 252static num num_rem (num a, num b);
261static num num_mod (num a, num b); 253static num num_mod (num a, num b);
262 254
263#if USE_MATH
264static double round_per_R5RS (double x);
265#endif
266static int is_zero_rvalue (RVALUE x); 255static int is_zero_rvalue (RVALUE x);
267 256
268static num num_zero; 257static num num_zero;
269static num num_one; 258static num num_one;
270 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
271/* macros for cell operations */ 264/* macros for cell operations */
272#define typeflag(p) ((p)->flag + 0) 265#define typeflag(p) (CELL(p)->flag + 0)
273#define set_typeflag(p,v) ((p)->flag = (v)) 266#define set_typeflag(p,v) (CELL(p)->flag = (v))
274#define type(p) (typeflag (p) & T_MASKTYPE) 267#define type(p) (typeflag (p) & T_MASKTYPE)
275 268
276INTERFACE int 269INTERFACE int
277is_string (pointer p) 270is_string (pointer p)
278{ 271{
279 return type (p) == T_STRING; 272 return type (p) == T_STRING;
280} 273}
281 274
282#define strvalue(p) ((p)->object.string.svalue) 275#define strvalue(p) (CELL(p)->object.string.svalue)
283#define strlength(p) ((p)->object.string.length) 276#define strlength(p) (CELL(p)->object.string.length)
284 277
285INTERFACE int 278INTERFACE int
286is_vector (pointer p) 279is_vector (pointer p)
287{ 280{
288 return type (p) == T_VECTOR; 281 return type (p) == T_VECTOR;
289} 282}
290 283
291#define vecvalue(p) ((p)->object.vector.vvalue) 284#define vecvalue(p) (CELL(p)->object.vector.vvalue)
292#define veclength(p) ((p)->object.vector.length) 285#define veclength(p) (CELL(p)->object.vector.length)
293INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj); 286INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
294INTERFACE pointer vector_get (pointer vec, uint32_t ielem); 287INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
295INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a); 288INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
296 289
297INTERFACE int 290INTERFACE int
… …
323string_value (pointer p) 316string_value (pointer p)
324{ 317{
325 return strvalue (p); 318 return strvalue (p);
326} 319}
327 320
328#define ivalue_unchecked(p) (p)->object.ivalue 321#define ivalue_unchecked(p) CELL(p)->object.ivalue
329#define set_ivalue(p,v) (p)->object.ivalue = (v) 322#define set_ivalue(p,v) CELL(p)->object.ivalue = (v)
330 323
331#if USE_REAL 324#if USE_REAL
332#define rvalue_unchecked(p) (p)->object.rvalue 325#define rvalue_unchecked(p) CELL(p)->object.rvalue
333#define set_rvalue(p,v) (p)->object.rvalue = (v) 326#define set_rvalue(p,v) CELL(p)->object.rvalue = (v)
334#else 327#else
335#define rvalue_unchecked(p) (p)->object.ivalue 328#define rvalue_unchecked(p) CELL(p)->object.ivalue
336#define set_rvalue(p,v) (p)->object.ivalue = (v) 329#define set_rvalue(p,v) CELL(p)->object.ivalue = (v)
337#endif 330#endif
338 331
339INTERFACE long 332INTERFACE long
340charvalue (pointer p) 333charvalue (pointer p)
341{ 334{
342 return ivalue_unchecked (p); 335 return ivalue_unchecked (p);
343} 336}
344 337
338#define port(p) CELL(p)->object.port
339#define set_port(p,v) port(p) = (v)
345INTERFACE int 340INTERFACE int
346is_port (pointer p) 341is_port (pointer p)
347{ 342{
348 return type (p) == T_PORT; 343 return type (p) == T_PORT;
349} 344}
350 345
351INTERFACE int 346INTERFACE int
352is_inport (pointer p) 347is_inport (pointer p)
353{ 348{
354 return is_port (p) && p->object.port->kind & port_input; 349 return is_port (p) && port (p)->kind & port_input;
355} 350}
356 351
357INTERFACE int 352INTERFACE int
358is_outport (pointer p) 353is_outport (pointer p)
359{ 354{
360 return is_port (p) && p->object.port->kind & port_output; 355 return is_port (p) && port (p)->kind & port_output;
361} 356}
362 357
363INTERFACE int 358INTERFACE int
364is_pair (pointer p) 359is_pair (pointer p)
365{ 360{
366 return type (p) == T_PAIR; 361 return type (p) == T_PAIR;
367} 362}
368 363
369#define car(p) ((p)->object.cons.car + 0) 364#define car(p) (POINTER (CELL(p)->object.cons.car))
370#define cdr(p) ((p)->object.cons.cdr + 0) 365#define cdr(p) (POINTER (CELL(p)->object.cons.cdr))
371 366
372static pointer caar (pointer p) { return car (car (p)); } 367static pointer caar (pointer p) { return car (car (p)); }
373static pointer cadr (pointer p) { return car (cdr (p)); } 368static pointer cadr (pointer p) { return car (cdr (p)); }
374static pointer cdar (pointer p) { return cdr (car (p)); } 369static pointer cdar (pointer p) { return cdr (car (p)); }
375static pointer cddr (pointer p) { return cdr (cdr (p)); } 370static pointer cddr (pointer p) { return cdr (cdr (p)); }
… …
379static pointer cdaar (pointer p) { return cdr (car (car (p))); } 374static pointer cdaar (pointer p) { return cdr (car (car (p))); }
380 375
381INTERFACE void 376INTERFACE void
382set_car (pointer p, pointer q) 377set_car (pointer p, pointer q)
383{ 378{
384 p->object.cons.car = q; 379 CELL(p)->object.cons.car = CELL (q);
385} 380}
386 381
387INTERFACE void 382INTERFACE void
388set_cdr (pointer p, pointer q) 383set_cdr (pointer p, pointer q)
389{ 384{
390 p->object.cons.cdr = q; 385 CELL(p)->object.cons.cdr = CELL (q);
391} 386}
392 387
393INTERFACE pointer 388INTERFACE pointer
394pair_car (pointer p) 389pair_car (pointer p)
395{ 390{
… …
525 proper list: length 520 proper list: length
526 circular list: -1 521 circular list: -1
527 not even a pair: -2 522 not even a pair: -2
528 dotted list: -2 minus length before dot 523 dotted list: -2 minus length before dot
529*/ 524*/
530INTERFACE int 525ecb_hot INTERFACE int
531list_length (SCHEME_P_ pointer a) 526list_length (SCHEME_P_ pointer a)
532{ 527{
533 int i = 0; 528 int i = 0;
534 pointer slow, fast; 529 pointer slow, fast;
535 530
… …
641 "gs", 636 "gs",
642 "rs", 637 "rs",
643 "us" 638 "us"
644}; 639};
645 640
646static int 641ecb_cold static int
647is_ascii_name (const char *name, int *pc) 642is_ascii_name (const char *name, int *pc)
648{ 643{
649 int i; 644 int i;
650 645
651 for (i = 0; i < 32; i++) 646 for (i = 0; i < 32; i++)
… …
670 665
671static int file_push (SCHEME_P_ const char *fname); 666static int file_push (SCHEME_P_ const char *fname);
672static void file_pop (SCHEME_P); 667static void file_pop (SCHEME_P);
673static int file_interactive (SCHEME_P); 668static int file_interactive (SCHEME_P);
674ecb_inline int is_one_of (const char *s, int c); 669ecb_inline int is_one_of (const char *s, int c);
675static int alloc_cellseg (SCHEME_P_ int n); 670static int alloc_cellseg (SCHEME_P);
676ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b); 671ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
677static void finalize_cell (SCHEME_P_ pointer a); 672static void finalize_cell (SCHEME_P_ pointer a);
678static int count_consecutive_cells (pointer x, int needed); 673static int count_consecutive_cells (pointer x, int needed);
679static 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);
680static pointer mk_number (SCHEME_P_ const num n); 675static pointer mk_number (SCHEME_P_ const num n);
… …
874 } 869 }
875 870
876 return ret; 871 return ret;
877} 872}
878 873
879#if USE_MATH
880
881/* Round to nearest. Round to even if midway */
882static double
883round_per_R5RS (double x)
884{
885 double fl = floor (x);
886 double ce = ceil (x);
887 double dfl = x - fl;
888 double dce = ce - x;
889
890 if (dfl > dce)
891 return ce;
892 else if (dfl < dce)
893 return fl;
894 else
895 {
896 if (fmod (fl, 2) == 0) /* I imagine this holds */
897 return fl;
898 else
899 return ce;
900 }
901}
902#endif
903
904static int 874static int
905is_zero_rvalue (RVALUE x) 875is_zero_rvalue (RVALUE x)
906{ 876{
907 return x == 0; 877 return x == 0;
908#if 0 878#if 0
… …
913#endif 883#endif
914#endif 884#endif
915} 885}
916 886
917/* allocate new cell segment */ 887/* allocate new cell segment */
918static int 888ecb_cold static int
919alloc_cellseg (SCHEME_P_ int n) 889alloc_cellseg (SCHEME_P)
920{ 890{
921 pointer newp; 891 struct cell *newp;
922 pointer last; 892 struct cell *last;
923 pointer p; 893 struct cell *p;
924 char *cp; 894 char *cp;
925 long i; 895 long i;
926 int k; 896 int k;
927 897
928 static int segsize = CELL_SEGSIZE >> 1; 898 static int segsize = CELL_SEGSIZE >> 1;
929 segsize <<= 1; 899 segsize <<= 1;
930 900
931 for (k = 0; k < n; k++)
932 {
933 if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
934 return k;
935
936 cp = malloc (segsize * sizeof (struct cell)); 901 cp = malloc (segsize * sizeof (struct cell));
937 902
938 if (!cp && USE_ERROR_CHECKING) 903 if (!cp && USE_ERROR_CHECKING)
939 return k; 904 return k;
940 905
941 i = ++SCHEME_V->last_cell_seg; 906 i = ++SCHEME_V->last_cell_seg;
942 SCHEME_V->alloc_seg[i] = cp; 907 SCHEME_V->alloc_seg[i] = cp;
943 908
944 newp = (pointer)cp; 909 newp = (struct cell *)cp;
945 SCHEME_V->cell_seg[i] = newp; 910 SCHEME_V->cell_seg[i] = newp;
946 SCHEME_V->cell_segsize[i] = segsize; 911 SCHEME_V->cell_segsize[i] = segsize;
947 SCHEME_V->fcells += segsize; 912 SCHEME_V->fcells += segsize;
948 last = newp + segsize - 1; 913 last = newp + segsize - 1;
949 914
950 for (p = newp; p <= last; p++) 915 for (p = newp; p <= last; p++)
951 { 916 {
917 pointer cp = POINTER (p);
952 set_typeflag (p, T_PAIR); 918 set_typeflag (cp, T_PAIR);
953 set_car (p, NIL); 919 set_car (cp, NIL);
954 set_cdr (p, p + 1); 920 set_cdr (cp, POINTER (p + 1));
955 } 921 }
956 922
957 set_cdr (last, SCHEME_V->free_cell); 923 set_cdr (POINTER (last), SCHEME_V->free_cell);
958 SCHEME_V->free_cell = newp; 924 SCHEME_V->free_cell = POINTER (newp);
959 }
960 925
961 return n; 926 return 1;
962} 927}
963 928
964/* get new cell. parameter a, b is marked by gc. */ 929/* get new cell. parameter a, b is marked by gc. */
965ecb_inline pointer 930ecb_inline pointer
966get_cell_x (SCHEME_P_ pointer a, pointer b) 931get_cell_x (SCHEME_P_ pointer a, pointer b)
… …
977 gc (SCHEME_A_ a, b); 942 gc (SCHEME_A_ a, b);
978 943
979 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)
980 { 945 {
981 /* 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 */
982 if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL) 947 if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
983 { 948 {
984#if USE_ERROR_CHECKING 949#if USE_ERROR_CHECKING
985 SCHEME_V->no_memory = 1; 950 SCHEME_V->no_memory = 1;
986 return S_SINK; 951 return S_SINK;
987#endif 952#endif
… …
999 } 964 }
1000} 965}
1001 966
1002/* To retain recent allocs before interpreter knows about them - 967/* To retain recent allocs before interpreter knows about them -
1003 Tehom */ 968 Tehom */
1004 969ecb_hot static void
1005static void
1006push_recent_alloc (SCHEME_P_ pointer recent, pointer extra) 970push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1007{ 971{
1008 pointer holder = get_cell_x (SCHEME_A_ recent, extra); 972 pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1009 973
1010 set_typeflag (holder, T_PAIR); 974 set_typeflag (holder, T_PAIR);
… …
1012 set_car (holder, recent); 976 set_car (holder, recent);
1013 set_cdr (holder, car (S_SINK)); 977 set_cdr (holder, car (S_SINK));
1014 set_car (S_SINK, holder); 978 set_car (S_SINK, holder);
1015} 979}
1016 980
1017static pointer 981ecb_hot static pointer
1018get_cell (SCHEME_P_ pointer a, pointer b) 982get_cell (SCHEME_P_ pointer a, pointer b)
1019{ 983{
1020 pointer cell = get_cell_x (SCHEME_A_ a, b); 984 pointer cell = get_cell_x (SCHEME_A_ a, b);
1021 985
1022 /* 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
… …
1040 return S_SINK; 1004 return S_SINK;
1041 1005
1042 /* Record it as a vector so that gc understands it. */ 1006 /* Record it as a vector so that gc understands it. */
1043 set_typeflag (v, T_VECTOR | T_ATOM); 1007 set_typeflag (v, T_VECTOR | T_ATOM);
1044 1008
1045 v->object.vector.vvalue = e; 1009 CELL(v)->object.vector.vvalue = e;
1046 v->object.vector.length = len; 1010 CELL(v)->object.vector.length = len;
1047 fill_vector (v, 0, init); 1011 fill_vector (v, 0, init);
1048 push_recent_alloc (SCHEME_A_ v, NIL); 1012 push_recent_alloc (SCHEME_A_ v, NIL);
1049 1013
1050 return v; 1014 return v;
1051} 1015}
… …
1060static void 1024static void
1061check_cell_alloced (pointer p, int expect_alloced) 1025check_cell_alloced (pointer p, int expect_alloced)
1062{ 1026{
1063 /* 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. */
1064 if (typeflag (p) & !expect_alloced) 1028 if (typeflag (p) & !expect_alloced)
1065 xwrstr ("Cell is already allocated!\n"); 1029 putstr (SCHEME_A_ "Cell is already allocated!\n");
1066 1030
1067 if (!(typeflag (p)) & expect_alloced) 1031 if (!(typeflag (p)) & expect_alloced)
1068 xwrstr ("Cell is not allocated!\n"); 1032 putstr (SCHEME_A_ "Cell is not allocated!\n");
1069} 1033}
1070 1034
1071static void 1035static void
1072check_range_alloced (pointer p, int n, int expect_alloced) 1036check_range_alloced (pointer p, int n, int expect_alloced)
1073{ 1037{
… …
1079#endif 1043#endif
1080 1044
1081/* Medium level cell allocation */ 1045/* Medium level cell allocation */
1082 1046
1083/* get new cons cell */ 1047/* get new cons cell */
1084pointer 1048ecb_hot pointer
1085xcons (SCHEME_P_ pointer a, pointer b, int immutable) 1049xcons (SCHEME_P_ pointer a, pointer b, int immutable)
1086{ 1050{
1087 pointer x = get_cell (SCHEME_A_ a, b); 1051 pointer x = get_cell (SCHEME_A_ a, b);
1088 1052
1089 set_typeflag (x, T_PAIR); 1053 set_typeflag (x, T_PAIR);
… …
1095 set_cdr (x, b); 1059 set_cdr (x, b);
1096 1060
1097 return x; 1061 return x;
1098} 1062}
1099 1063
1100static pointer 1064ecb_cold static pointer
1101generate_symbol (SCHEME_P_ const char *name) 1065generate_symbol (SCHEME_P_ const char *name)
1102{ 1066{
1103 pointer x = mk_string (SCHEME_A_ name); 1067 pointer x = mk_string (SCHEME_A_ name);
1104 setimmutable (x); 1068 setimmutable (x);
1105 set_typeflag (x, T_SYMBOL | T_ATOM); 1069 set_typeflag (x, T_SYMBOL | T_ATOM);
… …
1120 hash = (hash ^ *p++) * 16777619; 1084 hash = (hash ^ *p++) * 16777619;
1121 1085
1122 return hash % table_size; 1086 return hash % table_size;
1123} 1087}
1124 1088
1125static pointer 1089ecb_cold static pointer
1126oblist_initial_value (SCHEME_P) 1090oblist_initial_value (SCHEME_P)
1127{ 1091{
1128 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */ 1092 return mk_vector (SCHEME_A_ 461); /* probably should be bigger */
1129} 1093}
1130 1094
1131/* returns the new symbol */ 1095/* returns the new symbol */
1132static pointer 1096ecb_cold static pointer
1133oblist_add_by_name (SCHEME_P_ const char *name) 1097oblist_add_by_name (SCHEME_P_ const char *name)
1134{ 1098{
1135 pointer x = generate_symbol (SCHEME_A_ name); 1099 pointer x = generate_symbol (SCHEME_A_ name);
1136 int location = hash_fn (name, veclength (SCHEME_V->oblist)); 1100 int location = hash_fn (name, veclength (SCHEME_V->oblist));
1137 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location))); 1101 vector_set (SCHEME_V->oblist, location, immutable_cons (x, vector_get (SCHEME_V->oblist, location)));
1138 return x; 1102 return x;
1139} 1103}
1140 1104
1141ecb_inline pointer 1105ecb_cold static pointer
1142oblist_find_by_name (SCHEME_P_ const char *name) 1106oblist_find_by_name (SCHEME_P_ const char *name)
1143{ 1107{
1144 int location; 1108 int location;
1145 pointer x; 1109 pointer x;
1146 char *s; 1110 char *s;
… …
1157 } 1121 }
1158 1122
1159 return NIL; 1123 return NIL;
1160} 1124}
1161 1125
1162static pointer 1126ecb_cold static pointer
1163oblist_all_symbols (SCHEME_P) 1127oblist_all_symbols (SCHEME_P)
1164{ 1128{
1165 int i; 1129 int i;
1166 pointer x; 1130 pointer x;
1167 pointer ob_list = NIL; 1131 pointer ob_list = NIL;
… …
1173 return ob_list; 1137 return ob_list;
1174} 1138}
1175 1139
1176#else 1140#else
1177 1141
1178static pointer 1142ecb_cold static pointer
1179oblist_initial_value (SCHEME_P) 1143oblist_initial_value (SCHEME_P)
1180{ 1144{
1181 return NIL; 1145 return NIL;
1182} 1146}
1183 1147
1184ecb_inline pointer 1148ecb_cold static pointer
1185oblist_find_by_name (SCHEME_P_ const char *name) 1149oblist_find_by_name (SCHEME_P_ const char *name)
1186{ 1150{
1187 pointer x; 1151 pointer x;
1188 char *s; 1152 char *s;
1189 1153
… …
1198 1162
1199 return NIL; 1163 return NIL;
1200} 1164}
1201 1165
1202/* returns the new symbol */ 1166/* returns the new symbol */
1203static pointer 1167ecb_cold static pointer
1204oblist_add_by_name (SCHEME_P_ const char *name) 1168oblist_add_by_name (SCHEME_P_ const char *name)
1205{ 1169{
1206 pointer x = mk_string (SCHEME_A_ name); 1170 pointer x = generate_symbol (SCHEME_A_ name);
1207 set_typeflag (x, T_SYMBOL);
1208 setimmutable (x);
1209 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist); 1171 SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1210 return x; 1172 return x;
1211} 1173}
1212 1174
1213static pointer 1175ecb_cold static pointer
1214oblist_all_symbols (SCHEME_P) 1176oblist_all_symbols (SCHEME_P)
1215{ 1177{
1216 return SCHEME_V->oblist; 1178 return SCHEME_V->oblist;
1217} 1179}
1218 1180
1219#endif 1181#endif
1220 1182
1221#if USE_PORTS 1183#if USE_PORTS
1222static pointer 1184ecb_cold static pointer
1223mk_port (SCHEME_P_ port *p) 1185mk_port (SCHEME_P_ port *p)
1224{ 1186{
1225 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1187 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1226 1188
1227 set_typeflag (x, T_PORT | T_ATOM); 1189 set_typeflag (x, T_PORT | T_ATOM);
1228 x->object.port = p; 1190 set_port (x, p);
1229 1191
1230 return x; 1192 return x;
1231} 1193}
1232#endif 1194#endif
1233 1195
1234pointer 1196ecb_cold pointer
1235mk_foreign_func (SCHEME_P_ foreign_func f) 1197mk_foreign_func (SCHEME_P_ foreign_func f)
1236{ 1198{
1237 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1199 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1238 1200
1239 set_typeflag (x, (T_FOREIGN | T_ATOM)); 1201 set_typeflag (x, T_FOREIGN | T_ATOM);
1240 x->object.ff = f; 1202 CELL(x)->object.ff = f;
1241 1203
1242 return x; 1204 return x;
1243} 1205}
1244 1206
1245INTERFACE pointer 1207INTERFACE pointer
1246mk_character (SCHEME_P_ int c) 1208mk_character (SCHEME_P_ int c)
1247{ 1209{
1248 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1210 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1249 1211
1250 set_typeflag (x, (T_CHARACTER | T_ATOM)); 1212 set_typeflag (x, T_CHARACTER | T_ATOM);
1251 set_ivalue (x, c & 0xff); 1213 set_ivalue (x, c & 0xff);
1252 1214
1253 return x; 1215 return x;
1254} 1216}
1255 1217
1256/* get number atom (integer) */ 1218/* get number atom (integer) */
1257INTERFACE pointer 1219INTERFACE pointer
1258mk_integer (SCHEME_P_ long n) 1220mk_integer (SCHEME_P_ long n)
1259{ 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 {
1260 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1232 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1261 1233
1262 set_typeflag (x, (T_INTEGER | T_ATOM)); 1234 set_typeflag (x, T_INTEGER | T_ATOM);
1235 setimmutable (x); /* shouldn't do anythi9ng, doesn't cost anything */
1263 set_ivalue (x, n); 1236 set_ivalue (x, n);
1264 1237
1238 *pp = x;
1239 }
1240
1265 return x; 1241 return *pp;
1266} 1242}
1267 1243
1268INTERFACE pointer 1244INTERFACE pointer
1269mk_real (SCHEME_P_ RVALUE n) 1245mk_real (SCHEME_P_ RVALUE n)
1270{ 1246{
1271#if USE_REAL 1247#if USE_REAL
1272 pointer x = get_cell (SCHEME_A_ NIL, NIL); 1248 pointer x = get_cell (SCHEME_A_ NIL, NIL);
1273 1249
1274 set_typeflag (x, (T_REAL | T_ATOM)); 1250 set_typeflag (x, T_REAL | T_ATOM);
1275 set_rvalue (x, n); 1251 set_rvalue (x, n);
1276 1252
1277 return x; 1253 return x;
1278#else 1254#else
1279 return mk_integer (SCHEME_A_ n); 1255 return mk_integer (SCHEME_A_ n);
… …
1390 x = oblist_add_by_name (SCHEME_A_ name); 1366 x = oblist_add_by_name (SCHEME_A_ name);
1391 1367
1392 return x; 1368 return x;
1393} 1369}
1394 1370
1395INTERFACE pointer 1371ecb_cold INTERFACE pointer
1396gensym (SCHEME_P) 1372gensym (SCHEME_P)
1397{ 1373{
1398 pointer x; 1374 pointer x;
1399 char name[40] = "gensym-"; 1375 char name[40] = "gensym-";
1400 xnum (name + 7, ++SCHEME_V->gensym_cnt); 1376 xnum (name + 7, ++SCHEME_V->gensym_cnt);
… …
1407{ 1383{
1408 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x; 1384 return is_symbol (x) && oblist_find_by_name (SCHEME_A_ strvalue (x)) != x;
1409} 1385}
1410 1386
1411/* make symbol or number atom from string */ 1387/* make symbol or number atom from string */
1412static pointer 1388ecb_cold static pointer
1413mk_atom (SCHEME_P_ char *q) 1389mk_atom (SCHEME_P_ char *q)
1414{ 1390{
1415 char c, *p; 1391 char c, *p;
1416 int has_dec_point = 0; 1392 int has_dec_point = 0;
1417 int has_fp_exp = 0; 1393 int has_fp_exp = 0;
… …
1488 1464
1489 return mk_integer (SCHEME_A_ strtol (q, 0, 10)); 1465 return mk_integer (SCHEME_A_ strtol (q, 0, 10));
1490} 1466}
1491 1467
1492/* make constant */ 1468/* make constant */
1493static pointer 1469ecb_cold static pointer
1494mk_sharp_const (SCHEME_P_ char *name) 1470mk_sharp_const (SCHEME_P_ char *name)
1495{ 1471{
1496 if (!strcmp (name, "t")) 1472 if (!strcmp (name, "t"))
1497 return S_T; 1473 return S_T;
1498 else if (!strcmp (name, "f")) 1474 else if (!strcmp (name, "f"))
1499 return S_F; 1475 return S_F;
1500 else if (*name == '\\') /* #\w (character) */ 1476 else if (*name == '\\') /* #\w (character) */
1501 { 1477 {
1502 int c; 1478 int c;
1503 1479
1480 // TODO: optimise
1504 if (stricmp (name + 1, "space") == 0) 1481 if (stricmp (name + 1, "space") == 0)
1505 c = ' '; 1482 c = ' ';
1506 else if (stricmp (name + 1, "newline") == 0) 1483 else if (stricmp (name + 1, "newline") == 0)
1507 c = '\n'; 1484 c = '\n';
1508 else if (stricmp (name + 1, "return") == 0) 1485 else if (stricmp (name + 1, "return") == 0)
1509 c = '\r'; 1486 c = '\r';
1510 else if (stricmp (name + 1, "tab") == 0) 1487 else if (stricmp (name + 1, "tab") == 0)
1511 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;
1512 else if (name[1] == 'x' && name[2] != 0) 1499 else if (name[1] == 'x' && name[2] != 0)
1513 { 1500 {
1514 long c1 = strtol (name + 2, 0, 16); 1501 long c1 = strtol (name + 2, 0, 16);
1515 1502
1516 if (0 <= c1 && c1 <= UCHAR_MAX) 1503 if (0 <= c1 && c1 <= UCHAR_MAX)
… …
1541 return NIL; 1528 return NIL;
1542 } 1529 }
1543} 1530}
1544 1531
1545/* ========== 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}
1546 1552
1547/*-- 1553/*--
1548 * 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,
1549 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm, 1555 * sec. 2.3.5), the Schorr-Deutsch-Waite link-inversion algorithm,
1550 * for marking. 1556 * for marking.
1551 * 1557 *
1552 * The exception is vectors - vectors are currently marked recursively, 1558 * The exception is vectors - vectors are currently marked recursively,
1553 * 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
1554 * word of context in the vector 1560 * word of context in the vector
1555 */ 1561 */
1556static void 1562ecb_hot static void
1557mark (pointer a) 1563mark (pointer a)
1558{ 1564{
1559 pointer t, q, p; 1565 pointer t, q, p;
1560 1566
1561 t = 0; 1567 t = 0;
… …
1618 p = q; 1624 p = q;
1619 goto E6; 1625 goto E6;
1620 } 1626 }
1621} 1627}
1622 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
1623/* garbage collection. parameter a, b is marked. */ 1671/* garbage collection. parameter a, b is marked. */
1624static void 1672ecb_cold static void
1625gc (SCHEME_P_ pointer a, pointer b) 1673gc (SCHEME_P_ pointer a, pointer b)
1626{ 1674{
1627 pointer p;
1628 int i; 1675 int i;
1629 1676
1630 if (SCHEME_V->gc_verbose) 1677 if (SCHEME_V->gc_verbose)
1631 putstr (SCHEME_A_ "gc..."); 1678 putstr (SCHEME_A_ "gc...");
1632 1679
… …
1648 /* Mark recent objects the interpreter doesn't know about yet. */ 1695 /* Mark recent objects the interpreter doesn't know about yet. */
1649 mark (car (S_SINK)); 1696 mark (car (S_SINK));
1650 /* Mark any older stuff above nested C calls */ 1697 /* Mark any older stuff above nested C calls */
1651 mark (SCHEME_V->c_nest); 1698 mark (SCHEME_V->c_nest);
1652 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
1653 /* mark variables a, b */ 1707 /* mark variables a, b */
1654 mark (a); 1708 mark (a);
1655 mark (b); 1709 mark (b);
1656 1710
1657 /* garbage collect */ 1711 /* garbage collect */
1658 clrmark (NIL); 1712 clrmark (NIL);
1659 SCHEME_V->fcells = 0; 1713 SCHEME_V->fcells = 0;
1660 SCHEME_V->free_cell = NIL; 1714 SCHEME_V->free_cell = NIL;
1661 1715
1662 if (SCHEME_V->gc_verbose) 1716 if (SCHEME_V->gc_verbose)
1663 xwrstr ("freeing..."); 1717 putstr (SCHEME_A_ "freeing...");
1664 1718
1665 uint32_t total = 0; 1719 gc_free (SCHEME_A);
1666
1667 /* Here we scan the cells to build the free-list. */
1668 for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1669 {
1670 pointer end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
1671 total += SCHEME_V->cell_segsize [i];
1672
1673 for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1674 {
1675 if (is_mark (p))
1676 clrmark (p);
1677 else
1678 {
1679 /* reclaim cell */
1680 if (typeflag (p) != T_PAIR)
1681 {
1682 finalize_cell (SCHEME_A_ p);
1683 set_typeflag (p, T_PAIR);
1684 set_car (p, NIL);
1685 }
1686
1687 ++SCHEME_V->fcells;
1688 set_cdr (p, SCHEME_V->free_cell);
1689 SCHEME_V->free_cell = p;
1690 }
1691 }
1692 }
1693
1694 if (SCHEME_V->gc_verbose)
1695 {
1696 xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");
1697 }
1698}
1699
1700static void
1701finalize_cell (SCHEME_P_ pointer a)
1702{
1703 /* TODO, fast bitmap check? */
1704 if (is_string (a) || is_symbol (a))
1705 free (strvalue (a));
1706 else if (is_vector (a))
1707 free (vecvalue (a));
1708#if USE_PORTS
1709 else if (is_port (a))
1710 {
1711 if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)
1712 port_close (SCHEME_A_ a, port_input | port_output);
1713
1714 free (a->object.port);
1715 }
1716#endif
1717} 1720}
1718 1721
1719/* ========== Routines for Reading ========== */ 1722/* ========== Routines for Reading ========== */
1720 1723
1721static int 1724ecb_cold static int
1722file_push (SCHEME_P_ const char *fname) 1725file_push (SCHEME_P_ const char *fname)
1723{ 1726{
1724#if USE_PORTS 1727#if USE_PORTS
1725 int fin; 1728 int fin;
1726 1729
… …
1735 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1; 1738 SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1736 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;
1737 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;
1738 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;
1739 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0; 1742 SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1740 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);
1741 1744
1742#if SHOW_ERROR_LINE 1745#if SHOW_ERROR_LINE
1743 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;
1744 1747
1745 if (fname) 1748 if (fname)
… …
1752#else 1755#else
1753 return 1; 1756 return 1;
1754#endif 1757#endif
1755} 1758}
1756 1759
1757static void 1760ecb_cold static void
1758file_pop (SCHEME_P) 1761file_pop (SCHEME_P)
1759{ 1762{
1760 if (SCHEME_V->file_i != 0) 1763 if (SCHEME_V->file_i != 0)
1761 { 1764 {
1762 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i]; 1765 SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1763#if USE_PORTS 1766#if USE_PORTS
1764 port_close (SCHEME_A_ SCHEME_V->loadport, port_input); 1767 port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1765#endif 1768#endif
1766 SCHEME_V->file_i--; 1769 SCHEME_V->file_i--;
1767 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);
1768 } 1771 }
1769} 1772}
1770 1773
1771static int 1774ecb_cold static int
1772file_interactive (SCHEME_P) 1775file_interactive (SCHEME_P)
1773{ 1776{
1774#if USE_PORTS 1777#if USE_PORTS
1775 return SCHEME_V->file_i == 0 1778 return SCHEME_V->file_i == 0
1776 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO 1779 && SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1777 && (SCHEME_V->inport->object.port->kind & port_file); 1780 && (port (SCHEME_V->inport)->kind & port_file);
1778#else 1781#else
1779 return 0; 1782 return 0;
1780#endif 1783#endif
1781} 1784}
1782 1785
1783#if USE_PORTS 1786#if USE_PORTS
1784static port * 1787ecb_cold static port *
1785port_rep_from_filename (SCHEME_P_ const char *fn, int prop) 1788port_rep_from_filename (SCHEME_P_ const char *fn, int prop)
1786{ 1789{
1787 int fd; 1790 int fd;
1788 int flags; 1791 int flags;
1789 char *rw; 1792 char *rw;
… …
1812# endif 1815# endif
1813 1816
1814 return pt; 1817 return pt;
1815} 1818}
1816 1819
1817static pointer 1820ecb_cold static pointer
1818port_from_filename (SCHEME_P_ const char *fn, int prop) 1821port_from_filename (SCHEME_P_ const char *fn, int prop)
1819{ 1822{
1820 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop); 1823 port *pt = port_rep_from_filename (SCHEME_A_ fn, prop);
1821 1824
1822 if (!pt && USE_ERROR_CHECKING) 1825 if (!pt && USE_ERROR_CHECKING)
1823 return NIL; 1826 return NIL;
1824 1827
1825 return mk_port (SCHEME_A_ pt); 1828 return mk_port (SCHEME_A_ pt);
1826} 1829}
1827 1830
1828static port * 1831ecb_cold static port *
1829port_rep_from_file (SCHEME_P_ int f, int prop) 1832port_rep_from_file (SCHEME_P_ int f, int prop)
1830{ 1833{
1831 port *pt = malloc (sizeof *pt); 1834 port *pt = malloc (sizeof *pt);
1832 1835
1833 if (!pt && USE_ERROR_CHECKING) 1836 if (!pt && USE_ERROR_CHECKING)
… …
1838 pt->rep.stdio.file = f; 1841 pt->rep.stdio.file = f;
1839 pt->rep.stdio.closeit = 0; 1842 pt->rep.stdio.closeit = 0;
1840 return pt; 1843 return pt;
1841} 1844}
1842 1845
1843static pointer 1846ecb_cold static pointer
1844port_from_file (SCHEME_P_ int f, int prop) 1847port_from_file (SCHEME_P_ int f, int prop)
1845{ 1848{
1846 port *pt = port_rep_from_file (SCHEME_A_ f, prop); 1849 port *pt = port_rep_from_file (SCHEME_A_ f, prop);
1847 1850
1848 if (!pt && USE_ERROR_CHECKING) 1851 if (!pt && USE_ERROR_CHECKING)
1849 return NIL; 1852 return NIL;
1850 1853
1851 return mk_port (SCHEME_A_ pt); 1854 return mk_port (SCHEME_A_ pt);
1852} 1855}
1853 1856
1854static port * 1857ecb_cold static port *
1855port_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)
1856{ 1859{
1857 port *pt = malloc (sizeof (port)); 1860 port *pt = malloc (sizeof (port));
1858 1861
1859 if (!pt && USE_ERROR_CHECKING) 1862 if (!pt && USE_ERROR_CHECKING)
… …
1865 pt->rep.string.curr = start; 1868 pt->rep.string.curr = start;
1866 pt->rep.string.past_the_end = past_the_end; 1869 pt->rep.string.past_the_end = past_the_end;
1867 return pt; 1870 return pt;
1868} 1871}
1869 1872
1870static pointer 1873ecb_cold static pointer
1871port_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)
1872{ 1875{
1873 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);
1874 1877
1875 if (!pt && USE_ERROR_CHECKING) 1878 if (!pt && USE_ERROR_CHECKING)
… …
1878 return mk_port (SCHEME_A_ pt); 1881 return mk_port (SCHEME_A_ pt);
1879} 1882}
1880 1883
1881# define BLOCK_SIZE 256 1884# define BLOCK_SIZE 256
1882 1885
1883static port * 1886ecb_cold static port *
1884port_rep_from_scratch (SCHEME_P) 1887port_rep_from_scratch (SCHEME_P)
1885{ 1888{
1886 char *start; 1889 char *start;
1887 port *pt = malloc (sizeof (port)); 1890 port *pt = malloc (sizeof (port));
1888 1891
… …
1902 pt->rep.string.curr = start; 1905 pt->rep.string.curr = start;
1903 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1; 1906 pt->rep.string.past_the_end = start + BLOCK_SIZE - 1;
1904 return pt; 1907 return pt;
1905} 1908}
1906 1909
1907static pointer 1910ecb_cold static pointer
1908port_from_scratch (SCHEME_P) 1911port_from_scratch (SCHEME_P)
1909{ 1912{
1910 port *pt = port_rep_from_scratch (SCHEME_A); 1913 port *pt = port_rep_from_scratch (SCHEME_A);
1911 1914
1912 if (!pt && USE_ERROR_CHECKING) 1915 if (!pt && USE_ERROR_CHECKING)
1913 return NIL; 1916 return NIL;
1914 1917
1915 return mk_port (SCHEME_A_ pt); 1918 return mk_port (SCHEME_A_ pt);
1916} 1919}
1917 1920
1918static void 1921ecb_cold static void
1919port_close (SCHEME_P_ pointer p, int flag) 1922port_close (SCHEME_P_ pointer p, int flag)
1920{ 1923{
1921 port *pt = p->object.port; 1924 port *pt = port (p);
1922 1925
1923 pt->kind &= ~flag; 1926 pt->kind &= ~flag;
1924 1927
1925 if ((pt->kind & (port_input | port_output)) == 0) 1928 if ((pt->kind & (port_input | port_output)) == 0)
1926 { 1929 {
… …
1947/* get new character from input file */ 1950/* get new character from input file */
1948static int 1951static int
1949inchar (SCHEME_P) 1952inchar (SCHEME_P)
1950{ 1953{
1951 int c; 1954 int c;
1952 port *pt; 1955 port *pt = port (SCHEME_V->inport);
1953
1954 pt = SCHEME_V->inport->object.port;
1955 1956
1956 if (pt->kind & port_saw_EOF) 1957 if (pt->kind & port_saw_EOF)
1957 return EOF; 1958 return EOF;
1958 1959
1959 c = basic_inchar (pt); 1960 c = basic_inchar (pt);
… …
2026 port *pt; 2027 port *pt;
2027 2028
2028 if (c == EOF) 2029 if (c == EOF)
2029 return; 2030 return;
2030 2031
2031 pt = SCHEME_V->inport->object.port; 2032 pt = port (SCHEME_V->inport);
2032 pt->unget = c; 2033 pt->unget = c;
2033#else 2034#else
2034 if (c == EOF) 2035 if (c == EOF)
2035 return; 2036 return;
2036 2037
2037 ungot = c; 2038 ungot = c;
2038#endif 2039#endif
2039} 2040}
2040 2041
2041#if USE_PORTS 2042#if USE_PORTS
2042static int 2043ecb_cold static int
2043realloc_port_string (SCHEME_P_ port *p) 2044realloc_port_string (SCHEME_P_ port *p)
2044{ 2045{
2045 char *start = p->rep.string.start; 2046 char *start = p->rep.string.start;
2046 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;
2047 char *str = malloc (new_size); 2048 char *str = malloc (new_size);
… …
2060 else 2061 else
2061 return 0; 2062 return 0;
2062} 2063}
2063#endif 2064#endif
2064 2065
2065INTERFACE void 2066ecb_cold INTERFACE void
2066putstr (SCHEME_P_ const char *s) 2067putstr (SCHEME_P_ const char *s)
2067{ 2068{
2068#if USE_PORTS 2069#if USE_PORTS
2069 port *pt = SCHEME_V->outport->object.port; 2070 port *pt = port (SCHEME_V->outport);
2070 2071
2071 if (pt->kind & port_file) 2072 if (pt->kind & port_file)
2072 write (pt->rep.stdio.file, s, strlen (s)); 2073 write (pt->rep.stdio.file, s, strlen (s));
2073 else 2074 else
2074 for (; *s; s++) 2075 for (; *s; s++)
… …
2076 *pt->rep.string.curr++ = *s; 2077 *pt->rep.string.curr++ = *s;
2077 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))
2078 *pt->rep.string.curr++ = *s; 2079 *pt->rep.string.curr++ = *s;
2079 2080
2080#else 2081#else
2081 xwrstr (s); 2082 write (pt->rep.stdio.file, s, strlen (s));
2082#endif 2083#endif
2083} 2084}
2084 2085
2085static void 2086ecb_cold static void
2086putchars (SCHEME_P_ const char *s, int len) 2087putchars (SCHEME_P_ const char *s, int len)
2087{ 2088{
2088#if USE_PORTS 2089#if USE_PORTS
2089 port *pt = SCHEME_V->outport->object.port; 2090 port *pt = port (SCHEME_V->outport);
2090 2091
2091 if (pt->kind & port_file) 2092 if (pt->kind & port_file)
2092 write (pt->rep.stdio.file, s, len); 2093 write (pt->rep.stdio.file, s, len);
2093 else 2094 else
2094 { 2095 {
… …
2104#else 2105#else
2105 write (1, s, len); 2106 write (1, s, len);
2106#endif 2107#endif
2107} 2108}
2108 2109
2109INTERFACE void 2110ecb_cold INTERFACE void
2110putcharacter (SCHEME_P_ int c) 2111putcharacter (SCHEME_P_ int c)
2111{ 2112{
2112#if USE_PORTS 2113#if USE_PORTS
2113 port *pt = SCHEME_V->outport->object.port; 2114 port *pt = port (SCHEME_V->outport);
2114 2115
2115 if (pt->kind & port_file) 2116 if (pt->kind & port_file)
2116 { 2117 {
2117 char cc = c; 2118 char cc = c;
2118 write (pt->rep.stdio.file, &cc, 1); 2119 write (pt->rep.stdio.file, &cc, 1);
… …
2130 write (1, &c, 1); 2131 write (1, &c, 1);
2131#endif 2132#endif
2132} 2133}
2133 2134
2134/* read characters up to delimiter, but cater to character constants */ 2135/* read characters up to delimiter, but cater to character constants */
2135static char * 2136ecb_cold static char *
2136readstr_upto (SCHEME_P_ int skip, const char *delim) 2137readstr_upto (SCHEME_P_ int skip, const char *delim)
2137{ 2138{
2138 char *p = SCHEME_V->strbuff + skip; 2139 char *p = SCHEME_V->strbuff + skip;
2139 2140
2140 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))));
… …
2149 2150
2150 return SCHEME_V->strbuff; 2151 return SCHEME_V->strbuff;
2151} 2152}
2152 2153
2153/* read string expression "xxx...xxx" */ 2154/* read string expression "xxx...xxx" */
2154static pointer 2155ecb_cold static pointer
2155readstrexp (SCHEME_P_ char delim) 2156readstrexp (SCHEME_P_ char delim)
2156{ 2157{
2157 char *p = SCHEME_V->strbuff; 2158 char *p = SCHEME_V->strbuff;
2158 int c; 2159 int c;
2159 int c1 = 0; 2160 int c1 = 0;
… …
2192 case '7': 2193 case '7':
2193 state = st_oct1; 2194 state = st_oct1;
2194 c1 = c - '0'; 2195 c1 = c - '0';
2195 break; 2196 break;
2196 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
2197 case 'x': 2206 case 'x':
2198 case 'X': 2207 case 'X':
2199 state = st_x1; 2208 state = st_x1;
2200 c1 = 0; 2209 c1 = 0;
2201 break;
2202
2203 case 'n':
2204 *p++ = '\n';
2205 state = st_ok;
2206 break;
2207
2208 case 't':
2209 *p++ = '\t';
2210 state = st_ok;
2211 break;
2212
2213 case 'r':
2214 *p++ = '\r';
2215 state = st_ok;
2216 break; 2210 break;
2217 2211
2218 default: 2212 default:
2219 *p++ = c; 2213 *p++ = c;
2220 state = st_ok; 2214 state = st_ok;
… …
2272 } 2266 }
2273 } 2267 }
2274} 2268}
2275 2269
2276/* check c is in chars */ 2270/* check c is in chars */
2277ecb_inline int 2271ecb_cold int
2278is_one_of (const char *s, int c) 2272is_one_of (const char *s, int c)
2279{ 2273{
2280 return c == EOF || !!strchr (s, c); 2274 return c == EOF || !!strchr (s, c);
2281} 2275}
2282 2276
2283/* skip white characters */ 2277/* skip white characters */
2284ecb_inline int 2278ecb_cold int
2285skipspace (SCHEME_P) 2279skipspace (SCHEME_P)
2286{ 2280{
2287 int c, curr_line = 0; 2281 int c, curr_line = 0;
2288 2282
2289 do 2283 do
… …
2309 backchar (SCHEME_A_ c); 2303 backchar (SCHEME_A_ c);
2310 return 1; 2304 return 1;
2311} 2305}
2312 2306
2313/* get token */ 2307/* get token */
2314static int 2308ecb_cold static int
2315token (SCHEME_P) 2309token (SCHEME_P)
2316{ 2310{
2317 int c = skipspace (SCHEME_A); 2311 int c = skipspace (SCHEME_A);
2318 2312
2319 if (c == EOF) 2313 if (c == EOF)
… …
2417} 2411}
2418 2412
2419/* ========== Routines for Printing ========== */ 2413/* ========== Routines for Printing ========== */
2420#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL) 2414#define ok_abbrev(x) (is_pair(x) && cdr(x) == NIL)
2421 2415
2422static void 2416ecb_cold static void
2423printslashstring (SCHEME_P_ char *p, int len) 2417printslashstring (SCHEME_P_ char *p, int len)
2424{ 2418{
2425 int i; 2419 int i;
2426 unsigned char *s = (unsigned char *) p; 2420 unsigned char *s = (unsigned char *) p;
2427 2421
… …
2483 2477
2484 putcharacter (SCHEME_A_ '"'); 2478 putcharacter (SCHEME_A_ '"');
2485} 2479}
2486 2480
2487/* print atoms */ 2481/* print atoms */
2488static void 2482ecb_cold static void
2489printatom (SCHEME_P_ pointer l, int f) 2483printatom (SCHEME_P_ pointer l, int f)
2490{ 2484{
2491 char *p; 2485 char *p;
2492 int len; 2486 int len;
2493 2487
2494 atom2str (SCHEME_A_ l, f, &p, &len); 2488 atom2str (SCHEME_A_ l, f, &p, &len);
2495 putchars (SCHEME_A_ p, len); 2489 putchars (SCHEME_A_ p, len);
2496} 2490}
2497 2491
2498/* Uses internal buffer unless string pointer is already available */ 2492/* Uses internal buffer unless string pointer is already available */
2499static void 2493ecb_cold static void
2500atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen) 2494atom2str (SCHEME_P_ pointer l, int f, char **pp, int *plen)
2501{ 2495{
2502 char *p; 2496 char *p;
2503 2497
2504 if (l == NIL) 2498 if (l == NIL)
… …
2711 return car (d); 2705 return car (d);
2712 2706
2713 p = cons (car (d), cdr (d)); 2707 p = cons (car (d), cdr (d));
2714 q = p; 2708 q = p;
2715 2709
2716 while (cdr (cdr (p)) != NIL) 2710 while (cddr (p) != NIL)
2717 { 2711 {
2718 d = cons (car (p), cdr (p)); 2712 d = cons (car (p), cdr (p));
2719 2713
2720 if (cdr (cdr (p)) != NIL) 2714 if (cddr (p) != NIL)
2721 p = cdr (d); 2715 p = cdr (d);
2722 } 2716 }
2723 2717
2724 set_cdr (p, car (cdr (p))); 2718 set_cdr (p, cadr (p));
2725 return q; 2719 return q;
2726} 2720}
2727 2721
2728/* reverse list -- produce new list */ 2722/* reverse list -- produce new list */
2729static pointer 2723ecb_hot static pointer
2730reverse (SCHEME_P_ pointer a) 2724reverse (SCHEME_P_ pointer a)
2731{ 2725{
2732 /* a must be checked by gc */ 2726 /* a must be checked by gc */
2733 pointer p = NIL; 2727 pointer p = NIL;
2734 2728
… …
2737 2731
2738 return p; 2732 return p;
2739} 2733}
2740 2734
2741/* reverse list --- in-place */ 2735/* reverse list --- in-place */
2742static pointer 2736ecb_hot static pointer
2743reverse_in_place (SCHEME_P_ pointer term, pointer list) 2737reverse_in_place (SCHEME_P_ pointer term, pointer list)
2744{ 2738{
2745 pointer result = term; 2739 pointer result = term;
2746 pointer p = list; 2740 pointer p = list;
2747 2741
… …
2755 2749
2756 return result; 2750 return result;
2757} 2751}
2758 2752
2759/* append list -- produce new list (in reverse order) */ 2753/* append list -- produce new list (in reverse order) */
2760static pointer 2754ecb_hot static pointer
2761revappend (SCHEME_P_ pointer a, pointer b) 2755revappend (SCHEME_P_ pointer a, pointer b)
2762{ 2756{
2763 pointer result = a; 2757 pointer result = a;
2764 pointer p = b; 2758 pointer p = b;
2765 2759
… …
2774 2768
2775 return S_F; /* signal an error */ 2769 return S_F; /* signal an error */
2776} 2770}
2777 2771
2778/* equivalence of atoms */ 2772/* equivalence of atoms */
2779int 2773ecb_hot int
2780eqv (pointer a, pointer b) 2774eqv (pointer a, pointer b)
2781{ 2775{
2782 if (is_string (a)) 2776 if (is_string (a))
2783 { 2777 {
2784 if (is_string (b)) 2778 if (is_string (b))
… …
2878 } 2872 }
2879 else 2873 else
2880 set_car (env, immutable_cons (slot, car (env))); 2874 set_car (env, immutable_cons (slot, car (env)));
2881} 2875}
2882 2876
2883static pointer 2877ecb_hot static pointer
2884find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2878find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2885{ 2879{
2886 pointer x, y; 2880 pointer x, y;
2887 2881
2888 for (x = env; x != NIL; x = cdr (x)) 2882 for (x = env; x != NIL; x = cdr (x))
… …
2909 return NIL; 2903 return NIL;
2910} 2904}
2911 2905
2912#else /* USE_ALIST_ENV */ 2906#else /* USE_ALIST_ENV */
2913 2907
2914ecb_inline void 2908static void
2915new_frame_in_env (SCHEME_P_ pointer old_env) 2909new_frame_in_env (SCHEME_P_ pointer old_env)
2916{ 2910{
2917 SCHEME_V->envir = immutable_cons (NIL, old_env); 2911 SCHEME_V->envir = immutable_cons (NIL, old_env);
2918 setenvironment (SCHEME_V->envir); 2912 setenvironment (SCHEME_V->envir);
2919} 2913}
2920 2914
2921ecb_inline void 2915static void
2922new_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)
2923{ 2917{
2924 set_car (env, immutable_cons (immutable_cons (variable, value), car (env))); 2918 set_car (env, immutable_cons (immutable_cons (variable, value), car (env)));
2925} 2919}
2926 2920
2927static pointer 2921ecb_hot static pointer
2928find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all) 2922find_slot_in_env (SCHEME_P_ pointer env, pointer hdl, int all)
2929{ 2923{
2930 pointer x, y; 2924 pointer x, y;
2931 2925
2932 for (x = env; x != NIL; x = cdr (x)) 2926 for (x = env; x != NIL; x = cdr (x))
… …
2946 return NIL; 2940 return NIL;
2947} 2941}
2948 2942
2949#endif /* USE_ALIST_ENV else */ 2943#endif /* USE_ALIST_ENV else */
2950 2944
2951ecb_inline void 2945static void
2952new_slot_in_env (SCHEME_P_ pointer variable, pointer value) 2946new_slot_in_env (SCHEME_P_ pointer variable, pointer value)
2953{ 2947{
2954 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2 2948 assert (is_symbol (variable));//TODO: bug in current-ws/OP_LET2
2955 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);
2956} 2950}
2957 2951
2958ecb_inline void 2952static void
2959set_slot_in_env (SCHEME_P_ pointer slot, pointer value) 2953set_slot_in_env (SCHEME_P_ pointer slot, pointer value)
2960{ 2954{
2961 set_cdr (slot, value); 2955 set_cdr (slot, value);
2962} 2956}
2963 2957
2964ecb_inline pointer 2958static pointer
2965slot_value_in_env (pointer slot) 2959slot_value_in_env (pointer slot)
2966{ 2960{
2967 return cdr (slot); 2961 return cdr (slot);
2968} 2962}
2969 2963
2970/* ========== Evaluation Cycle ========== */ 2964/* ========== Evaluation Cycle ========== */
2971 2965
2972static int 2966ecb_cold static int
2973xError_1 (SCHEME_P_ const char *s, pointer a) 2967xError_1 (SCHEME_P_ const char *s, pointer a)
2974{ 2968{
2975#if USE_ERROR_HOOK 2969#if USE_ERROR_HOOK
2976 pointer x; 2970 pointer x;
2977 pointer hdl = SCHEME_V->ERROR_HOOK; 2971 pointer hdl = SCHEME_V->ERROR_HOOK;
… …
3053 pointer code; 3047 pointer code;
3054}; 3048};
3055 3049
3056# define STACK_GROWTH 3 3050# define STACK_GROWTH 3
3057 3051
3058static void 3052ecb_hot static void
3059s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3053s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3060{ 3054{
3061 int nframes = (uintptr_t)SCHEME_V->dump; 3055 int nframes = (uintptr_t)SCHEME_V->dump;
3062 struct dump_stack_frame *next_frame; 3056 struct dump_stack_frame *next_frame;
3063 3057
3064 /* enough room for the next frame? */ 3058 /* enough room for the next frame? */
3065 if (nframes >= SCHEME_V->dump_size) 3059 if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3066 { 3060 {
3067 SCHEME_V->dump_size += STACK_GROWTH; 3061 SCHEME_V->dump_size += STACK_GROWTH;
3068 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);
3069 } 3063 }
3070 3064
… …
3076 next_frame->code = code; 3070 next_frame->code = code;
3077 3071
3078 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1); 3072 SCHEME_V->dump = (pointer)(uintptr_t)(nframes + 1);
3079} 3073}
3080 3074
3081static int 3075static ecb_hot int
3082xs_return (SCHEME_P_ pointer a) 3076xs_return (SCHEME_P_ pointer a)
3083{ 3077{
3084 int nframes = (uintptr_t)SCHEME_V->dump; 3078 int nframes = (uintptr_t)SCHEME_V->dump;
3085 struct dump_stack_frame *frame; 3079 struct dump_stack_frame *frame;
3086 3080
… …
3097 SCHEME_V->dump = (pointer)(uintptr_t)nframes; 3091 SCHEME_V->dump = (pointer)(uintptr_t)nframes;
3098 3092
3099 return 0; 3093 return 0;
3100} 3094}
3101 3095
3102ecb_inline void 3096ecb_cold void
3103dump_stack_reset (SCHEME_P) 3097dump_stack_reset (SCHEME_P)
3104{ 3098{
3105 /* 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 */
3106 SCHEME_V->dump = (pointer)+0; 3100 SCHEME_V->dump = (pointer)+0;
3107} 3101}
3108 3102
3109ecb_inline void 3103ecb_cold void
3110dump_stack_initialize (SCHEME_P) 3104dump_stack_initialize (SCHEME_P)
3111{ 3105{
3112 SCHEME_V->dump_size = 0; 3106 SCHEME_V->dump_size = 0;
3113 SCHEME_V->dump_base = 0; 3107 SCHEME_V->dump_base = 0;
3114 dump_stack_reset (SCHEME_A); 3108 dump_stack_reset (SCHEME_A);
3115} 3109}
3116 3110
3117static void 3111ecb_cold static void
3118dump_stack_free (SCHEME_P) 3112dump_stack_free (SCHEME_P)
3119{ 3113{
3120 free (SCHEME_V->dump_base); 3114 free (SCHEME_V->dump_base);
3121 SCHEME_V->dump_base = 0; 3115 SCHEME_V->dump_base = 0;
3122 SCHEME_V->dump = (pointer)0; 3116 SCHEME_V->dump = (pointer)0;
3123 SCHEME_V->dump_size = 0; 3117 SCHEME_V->dump_size = 0;
3124} 3118}
3125 3119
3126static void 3120ecb_cold static void
3127dump_stack_mark (SCHEME_P) 3121dump_stack_mark (SCHEME_P)
3128{ 3122{
3129 int nframes = (uintptr_t)SCHEME_V->dump; 3123 int nframes = (uintptr_t)SCHEME_V->dump;
3130 int i; 3124 int i;
3131 3125
… …
3137 mark (frame->envir); 3131 mark (frame->envir);
3138 mark (frame->code); 3132 mark (frame->code);
3139 } 3133 }
3140} 3134}
3141 3135
3142static pointer 3136ecb_cold static pointer
3143ss_get_cont (SCHEME_P) 3137ss_get_cont (SCHEME_P)
3144{ 3138{
3145 int nframes = (uintptr_t)SCHEME_V->dump; 3139 int nframes = (uintptr_t)SCHEME_V->dump;
3146 int i; 3140 int i;
3147 3141
… …
3159 } 3153 }
3160 3154
3161 return cont; 3155 return cont;
3162} 3156}
3163 3157
3164static void 3158ecb_cold static void
3165ss_set_cont (SCHEME_P_ pointer cont) 3159ss_set_cont (SCHEME_P_ pointer cont)
3166{ 3160{
3167 int i = 0; 3161 int i = 0;
3168 struct dump_stack_frame *frame = SCHEME_V->dump_base; 3162 struct dump_stack_frame *frame = SCHEME_V->dump_base;
3169 3163
… …
3181 SCHEME_V->dump = (pointer)(uintptr_t)i; 3175 SCHEME_V->dump = (pointer)(uintptr_t)i;
3182} 3176}
3183 3177
3184#else 3178#else
3185 3179
3186ecb_inline void 3180ecb_cold void
3187dump_stack_reset (SCHEME_P) 3181dump_stack_reset (SCHEME_P)
3188{ 3182{
3189 SCHEME_V->dump = NIL; 3183 SCHEME_V->dump = NIL;
3190} 3184}
3191 3185
3192ecb_inline void 3186ecb_cold void
3193dump_stack_initialize (SCHEME_P) 3187dump_stack_initialize (SCHEME_P)
3194{ 3188{
3195 dump_stack_reset (SCHEME_A); 3189 dump_stack_reset (SCHEME_A);
3196} 3190}
3197 3191
3198static void 3192ecb_cold static void
3199dump_stack_free (SCHEME_P) 3193dump_stack_free (SCHEME_P)
3200{ 3194{
3201 SCHEME_V->dump = NIL; 3195 SCHEME_V->dump = NIL;
3202} 3196}
3203 3197
3204static int 3198ecb_hot static int
3205xs_return (SCHEME_P_ pointer a) 3199xs_return (SCHEME_P_ pointer a)
3206{ 3200{
3207 pointer dump = SCHEME_V->dump; 3201 pointer dump = SCHEME_V->dump;
3208 3202
3209 SCHEME_V->value = a; 3203 SCHEME_V->value = a;
… …
3219 SCHEME_V->dump = dump; 3213 SCHEME_V->dump = dump;
3220 3214
3221 return 0; 3215 return 0;
3222} 3216}
3223 3217
3224static void 3218ecb_hot static void
3225s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code) 3219s_save (SCHEME_P_ enum scheme_opcodes op, pointer args, pointer code)
3226{ 3220{
3227 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op), 3221 SCHEME_V->dump = cons (mk_integer (SCHEME_A_ op),
3228 cons (args, 3222 cons (args,
3229 cons (SCHEME_V->envir, 3223 cons (SCHEME_V->envir,
3230 cons (code, 3224 cons (code,
3231 SCHEME_V->dump)))); 3225 SCHEME_V->dump))));
3232} 3226}
3233 3227
3234static void 3228ecb_cold static void
3235dump_stack_mark (SCHEME_P) 3229dump_stack_mark (SCHEME_P)
3236{ 3230{
3237 mark (SCHEME_V->dump); 3231 mark (SCHEME_V->dump);
3238} 3232}
3239 3233
3240static pointer 3234ecb_cold static pointer
3241ss_get_cont (SCHEME_P) 3235ss_get_cont (SCHEME_P)
3242{ 3236{
3243 return SCHEME_V->dump; 3237 return SCHEME_V->dump;
3244} 3238}
3245 3239
3246static void 3240ecb_cold static void
3247ss_set_cont (SCHEME_P_ pointer cont) 3241ss_set_cont (SCHEME_P_ pointer cont)
3248{ 3242{
3249 SCHEME_V->dump = cont; 3243 SCHEME_V->dump = cont;
3250} 3244}
3251 3245
… …
3309 break; 3303 break;
3310 } 3304 }
3311} 3305}
3312#endif 3306#endif
3313 3307
3314static int 3308/* syntax, eval, core, ... */
3309ecb_hot static int
3315opexe_0 (SCHEME_P_ enum scheme_opcodes op) 3310opexe_0 (SCHEME_P_ enum scheme_opcodes op)
3316{ 3311{
3317 pointer args = SCHEME_V->args; 3312 pointer args = SCHEME_V->args;
3318 pointer x, y; 3313 pointer x, y;
3319 3314
… …
3326 s_return (S_T); 3321 s_return (S_T);
3327#endif 3322#endif
3328 case OP_LOAD: /* load */ 3323 case OP_LOAD: /* load */
3329 if (file_interactive (SCHEME_A)) 3324 if (file_interactive (SCHEME_A))
3330 { 3325 {
3331 xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n"); 3326 putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3332 //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)));
3333 } 3328 }
3334 3329
3335 if (!file_push (SCHEME_A_ strvalue (car (args)))) 3330 if (!file_push (SCHEME_A_ strvalue (car (args))))
3336 Error_1 ("unable to open", car (args)); 3331 Error_1 ("unable to open", car (args));
3337 else 3332 else
… …
3341 } 3336 }
3342 3337
3343 case OP_T0LVL: /* top level */ 3338 case OP_T0LVL: /* top level */
3344 3339
3345 /* If we reached the end of file, this loop is done. */ 3340 /* If we reached the end of file, this loop is done. */
3346 if (SCHEME_V->loadport->object.port->kind & port_saw_EOF) 3341 if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3347 { 3342 {
3348 if (SCHEME_V->file_i == 0) 3343 if (SCHEME_V->file_i == 0)
3349 { 3344 {
3350 SCHEME_V->args = NIL; 3345 SCHEME_V->args = NIL;
3351 s_goto (OP_QUIT); 3346 s_goto (OP_QUIT);
… …
3429#endif 3424#endif
3430 if (is_symbol (SCHEME_V->code)) /* symbol */ 3425 if (is_symbol (SCHEME_V->code)) /* symbol */
3431 { 3426 {
3432 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);
3433 3428
3434 if (x != NIL) 3429 if (x == NIL)
3435 s_return (slot_value_in_env (x));
3436 else
3437 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));
3438 } 3433 }
3439 else if (is_pair (SCHEME_V->code)) 3434 else if (is_pair (SCHEME_V->code))
3440 { 3435 {
3441 x = car (SCHEME_V->code); 3436 x = car (SCHEME_V->code);
3442 3437
… …
3519 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */ 3514 s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3520 else if (is_foreign (SCHEME_V->code)) 3515 else if (is_foreign (SCHEME_V->code))
3521 { 3516 {
3522 /* Keep nested calls from GC'ing the arglist */ 3517 /* Keep nested calls from GC'ing the arglist */
3523 push_recent_alloc (SCHEME_A_ args, NIL); 3518 push_recent_alloc (SCHEME_A_ args, NIL);
3524 x = SCHEME_V->code->object.ff (SCHEME_A_ args); 3519 x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3525 3520
3526 s_return (x); 3521 s_return (x);
3527 } 3522 }
3528 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 */
3529 { 3524 {
… …
3566 3561
3567 case OP_DOMACRO: /* do macro */ 3562 case OP_DOMACRO: /* do macro */
3568 SCHEME_V->code = SCHEME_V->value; 3563 SCHEME_V->code = SCHEME_V->value;
3569 s_goto (OP_EVAL); 3564 s_goto (OP_EVAL);
3570 3565
3571#if 1
3572
3573 case OP_LAMBDA: /* lambda */ 3566 case OP_LAMBDA: /* lambda */
3574 /* 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
3575 set SCHEME_V->value fall thru */ 3568 set SCHEME_V->value fall thru */
3576 { 3569 {
3577 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);
… …
3583 SCHEME_V->code = slot_value_in_env (f); 3576 SCHEME_V->code = slot_value_in_env (f);
3584 s_goto (OP_APPLY); 3577 s_goto (OP_APPLY);
3585 } 3578 }
3586 3579
3587 SCHEME_V->value = SCHEME_V->code; 3580 SCHEME_V->value = SCHEME_V->code;
3588 /* Fallthru */
3589 } 3581 }
3582 /* Fallthru */
3590 3583
3591 case OP_LAMBDA1: 3584 case OP_LAMBDA1:
3592 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));
3593
3594#else
3595
3596 case OP_LAMBDA: /* lambda */
3597 s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3598
3599#endif
3600 3586
3601 case OP_MKCLOSURE: /* make-closure */ 3587 case OP_MKCLOSURE: /* make-closure */
3602 x = car (args); 3588 x = car (args);
3603 3589
3604 if (car (x) == SCHEME_V->LAMBDA) 3590 if (car (x) == SCHEME_V->LAMBDA)
… …
4014 } 4000 }
4015 4001
4016 if (USE_ERROR_CHECKING) abort (); 4002 if (USE_ERROR_CHECKING) abort ();
4017} 4003}
4018 4004
4019static int 4005/* math, cxr */
4006ecb_hot static int
4020opexe_1 (SCHEME_P_ enum scheme_opcodes op) 4007opexe_1 (SCHEME_P_ enum scheme_opcodes op)
4021{ 4008{
4022 pointer args = SCHEME_V->args; 4009 pointer args = SCHEME_V->args;
4023 pointer x = car (args); 4010 pointer x = car (args);
4024 num v; 4011 num v;
4025 4012
4026 switch (op) 4013 switch (op)
4027 { 4014 {
4028#if USE_MATH 4015#if USE_MATH
4029 case OP_INEX2EX: /* inexact->exact */ 4016 case OP_INEX2EX: /* inexact->exact */
4030 {
4031 if (is_integer (x)) 4017 if (!is_integer (x))
4032 s_return (x); 4018 {
4033
4034 RVALUE r = rvalue_unchecked (x); 4019 RVALUE r = rvalue_unchecked (x);
4035 4020
4036 if (r == (RVALUE)(IVALUE)r) 4021 if (r == (RVALUE)(IVALUE)r)
4037 s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x))); 4022 x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
4038 else 4023 else
4039 Error_1 ("inexact->exact: not integral:", x); 4024 Error_1 ("inexact->exact: not integral:", x);
4040 } 4025 }
4041 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))));
4042 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))));
4043 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))))));
4044 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))));
4045 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))));
4046 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))));
4047 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))));
4048 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))));
4049 4043
4050 case OP_ATAN: 4044 case OP_ATAN:
4045 s_return (mk_real (SCHEME_A_
4051 if (cdr (args) == NIL) 4046 cdr (args) == NIL
4052 s_return (mk_real (SCHEME_A_ atan (rvalue (x)))); 4047 ? atan (rvalue (x))
4053 else 4048 : atan2 (rvalue (x), rvalue (cadr (args)))));
4054 {
4055 pointer y = cadr (args);
4056 s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4057 }
4058
4059 case OP_SQRT:
4060 s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4061 4049
4062 case OP_EXPT: 4050 case OP_EXPT:
4063 { 4051 {
4064 RVALUE result; 4052 RVALUE result;
4065 int real_result = 1; 4053 int real_result = 1;
… …
4088 if (real_result) 4076 if (real_result)
4089 s_return (mk_real (SCHEME_A_ result)); 4077 s_return (mk_real (SCHEME_A_ result));
4090 else 4078 else
4091 s_return (mk_integer (SCHEME_A_ result)); 4079 s_return (mk_integer (SCHEME_A_ result));
4092 } 4080 }
4093
4094 case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4095 case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4096
4097 case OP_TRUNCATE:
4098 {
4099 RVALUE n = rvalue (x);
4100 s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4101 }
4102
4103 case OP_ROUND:
4104 if (is_integer (x))
4105 s_return (x);
4106
4107 s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));
4108#endif 4081#endif
4109 4082
4110 case OP_ADD: /* + */ 4083 case OP_ADD: /* + */
4111 v = num_zero; 4084 v = num_zero;
4112 4085
… …
4414 memcpy (pos, strvalue (car (x)), strlength (car (x))); 4387 memcpy (pos, strvalue (car (x)), strlength (car (x)));
4415 4388
4416 s_return (newstr); 4389 s_return (newstr);
4417 } 4390 }
4418 4391
4419 case OP_SUBSTR: /* substring */ 4392 case OP_STRING_COPY: /* substring/string-copy */
4420 { 4393 {
4421 char *str = strvalue (x); 4394 char *str = strvalue (x);
4422 int index0 = ivalue_unchecked (cadr (args)); 4395 int index0 = cadr (args) == NIL ? 0 : ivalue_unchecked (cadr (args));
4423 int index1; 4396 int index1;
4424 int len; 4397 int len;
4425 4398
4426 if (index0 > strlength (x)) 4399 if (index0 > strlength (x))
4427 Error_1 ("substring: start out of bounds:", cadr (args)); 4400 Error_1 ("string->copy: start out of bounds:", cadr (args));
4428 4401
4429 if (cddr (args) != NIL) 4402 if (cddr (args) != NIL)
4430 { 4403 {
4431 index1 = ivalue_unchecked (caddr (args)); 4404 index1 = ivalue_unchecked (caddr (args));
4432 4405
4433 if (index1 > strlength (x) || index1 < index0) 4406 if (index1 > strlength (x) || index1 < index0)
4434 Error_1 ("substring: end out of bounds:", caddr (args)); 4407 Error_1 ("string->copy: end out of bounds:", caddr (args));
4435 } 4408 }
4436 else 4409 else
4437 index1 = strlength (x); 4410 index1 = strlength (x);
4438 4411
4439 len = index1 - index0; 4412 len = index1 - index0;
4440 x = mk_empty_string (SCHEME_A_ len, ' '); 4413 x = mk_counted_string (SCHEME_A_ str + index0, len);
4441 memcpy (strvalue (x), str + index0, len);
4442 strvalue (x)[len] = 0;
4443 4414
4444 s_return (x); 4415 s_return (x);
4445 } 4416 }
4446 4417
4447 case OP_VECTOR: /* vector */ 4418 case OP_VECTOR: /* vector */
… …
4521 } 4492 }
4522 4493
4523 if (USE_ERROR_CHECKING) abort (); 4494 if (USE_ERROR_CHECKING) abort ();
4524} 4495}
4525 4496
4526static int 4497/* relational ops */
4498ecb_hot static int
4527opexe_2 (SCHEME_P_ enum scheme_opcodes op) 4499opexe_2 (SCHEME_P_ enum scheme_opcodes op)
4528{ 4500{
4529 pointer x = SCHEME_V->args; 4501 pointer x = SCHEME_V->args;
4530 4502
4531 for (;;) 4503 for (;;)
… …
4552 } 4524 }
4553 4525
4554 s_return (S_T); 4526 s_return (S_T);
4555} 4527}
4556 4528
4557static int 4529/* predicates */
4530ecb_hot static int
4558opexe_3 (SCHEME_P_ enum scheme_opcodes op) 4531opexe_3 (SCHEME_P_ enum scheme_opcodes op)
4559{ 4532{
4560 pointer args = SCHEME_V->args; 4533 pointer args = SCHEME_V->args;
4561 pointer a = car (args); 4534 pointer a = car (args);
4562 pointer d = cdr (args); 4535 pointer d = cdr (args);
… …
4609 } 4582 }
4610 4583
4611 s_retbool (r); 4584 s_retbool (r);
4612} 4585}
4613 4586
4614static int 4587/* promises, list ops, ports */
4588ecb_hot static int
4615opexe_4 (SCHEME_P_ enum scheme_opcodes op) 4589opexe_4 (SCHEME_P_ enum scheme_opcodes op)
4616{ 4590{
4617 pointer args = SCHEME_V->args; 4591 pointer args = SCHEME_V->args;
4618 pointer a = car (args); 4592 pointer a = car (args);
4619 pointer x, y; 4593 pointer x, y;
… …
4632 } 4606 }
4633 else 4607 else
4634 s_return (SCHEME_V->code); 4608 s_return (SCHEME_V->code);
4635 4609
4636 case OP_SAVE_FORCED: /* Save forced value replacing promise */ 4610 case OP_SAVE_FORCED: /* Save forced value replacing promise */
4637 memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell)); 4611 *CELL (SCHEME_V->code) = *CELL (SCHEME_V->value);
4638 s_return (SCHEME_V->value); 4612 s_return (SCHEME_V->value);
4639 4613
4640#if USE_PORTS 4614#if USE_PORTS
4615
4616 case OP_EOF_OBJECT: /* eof-object */
4617 s_return (S_EOF);
4641 4618
4642 case OP_WRITE: /* write */ 4619 case OP_WRITE: /* write */
4643 case OP_DISPLAY: /* display */ 4620 case OP_DISPLAY: /* display */
4644 case OP_WRITE_CHAR: /* write-char */ 4621 case OP_WRITE_CHAR: /* write-char */
4645 if (is_pair (cdr (SCHEME_V->args))) 4622 if (is_pair (cdr (SCHEME_V->args)))
… …
4787 SCHEME_V->gc_verbose = (a != S_F); 4764 SCHEME_V->gc_verbose = (a != S_F);
4788 s_retbool (was); 4765 s_retbool (was);
4789 } 4766 }
4790 4767
4791 case OP_NEWSEGMENT: /* new-segment */ 4768 case OP_NEWSEGMENT: /* new-segment */
4769#if 0
4792 if (!is_pair (args) || !is_number (a)) 4770 if (!is_pair (args) || !is_number (a))
4793 Error_0 ("new-segment: argument must be a number"); 4771 Error_0 ("new-segment: argument must be a number");
4794 4772#endif
4795 alloc_cellseg (SCHEME_A_ ivalue (a)); 4773 s_retbool (alloc_cellseg (SCHEME_A));
4796
4797 s_return (S_T);
4798 4774
4799 case OP_OBLIST: /* oblist */ 4775 case OP_OBLIST: /* oblist */
4800 s_return (oblist_all_symbols (SCHEME_A)); 4776 s_return (oblist_all_symbols (SCHEME_A));
4801 4777
4802#if USE_PORTS 4778#if USE_PORTS
… …
4872 s_return (p == NIL ? S_F : p); 4848 s_return (p == NIL ? S_F : p);
4873 } 4849 }
4874 4850
4875 case OP_GET_OUTSTRING: /* get-output-string */ 4851 case OP_GET_OUTSTRING: /* get-output-string */
4876 { 4852 {
4877 port *p; 4853 port *p = port (a);
4878 4854
4879 if ((p = a->object.port)->kind & port_string) 4855 if (p->kind & port_string)
4880 { 4856 {
4881 off_t size; 4857 off_t size;
4882 char *str; 4858 char *str;
4883 4859
4884 size = p->rep.string.curr - p->rep.string.start + 1; 4860 size = p->rep.string.curr - p->rep.string.start + 1;
… …
4919 } 4895 }
4920 4896
4921 if (USE_ERROR_CHECKING) abort (); 4897 if (USE_ERROR_CHECKING) abort ();
4922} 4898}
4923 4899
4924static int 4900/* reading */
4901ecb_cold static int
4925opexe_5 (SCHEME_P_ enum scheme_opcodes op) 4902opexe_5 (SCHEME_P_ enum scheme_opcodes op)
4926{ 4903{
4927 pointer args = SCHEME_V->args; 4904 pointer args = SCHEME_V->args;
4928 pointer x; 4905 pointer x;
4929 4906
… …
4989 int res; 4966 int res;
4990 4967
4991 if (is_pair (args)) 4968 if (is_pair (args))
4992 p = car (args); 4969 p = car (args);
4993 4970
4994 res = p->object.port->kind & port_string; 4971 res = port (p)->kind & port_string;
4995 4972
4996 s_retbool (res); 4973 s_retbool (res);
4997 } 4974 }
4998 4975
4999 case OP_SET_INPORT: /* set-input-port */ 4976 case OP_SET_INPORT: /* set-input-port */
… …
5271 } 5248 }
5272 5249
5273 if (USE_ERROR_CHECKING) abort (); 5250 if (USE_ERROR_CHECKING) abort ();
5274} 5251}
5275 5252
5276static int 5253/* list ops */
5254ecb_hot static int
5277opexe_6 (SCHEME_P_ enum scheme_opcodes op) 5255opexe_6 (SCHEME_P_ enum scheme_opcodes op)
5278{ 5256{
5279 pointer args = SCHEME_V->args; 5257 pointer args = SCHEME_V->args;
5280 pointer a = car (args); 5258 pointer a = car (args);
5281 pointer x, y; 5259 pointer x, y;
… …
5339 5317
5340/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */ 5318/* dispatch functions (opexe_x) return new opcode, or 0 for same opcode, or -1 to stop */
5341typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes); 5319typedef int (*dispatch_func)(SCHEME_P_ enum scheme_opcodes);
5342 5320
5343typedef int (*test_predicate)(pointer); 5321typedef int (*test_predicate)(pointer);
5344static int 5322
5323ecb_hot static int
5345tst_any (pointer p) 5324tst_any (pointer p)
5346{ 5325{
5347 return 1; 5326 return 1;
5348} 5327}
5349 5328
5350static int 5329ecb_hot static int
5351tst_inonneg (pointer p) 5330tst_inonneg (pointer p)
5352{ 5331{
5353 return is_integer (p) && ivalue_unchecked (p) >= 0; 5332 return is_integer (p) && ivalue_unchecked (p) >= 0;
5354} 5333}
5355 5334
5356static int 5335ecb_hot static int
5357tst_is_list (SCHEME_P_ pointer p) 5336tst_is_list (SCHEME_P_ pointer p)
5358{ 5337{
5359 return p == NIL || is_pair (p); 5338 return p == NIL || is_pair (p);
5360} 5339}
5361 5340
… …
5404#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00" 5383#define OP_DEF(func,name,minarity,maxarity,argtest,op) name "\x00"
5405#include "opdefines.h" 5384#include "opdefines.h"
5406#undef OP_DEF 5385#undef OP_DEF
5407; 5386;
5408 5387
5409static const char * 5388ecb_cold static const char *
5410opname (int idx) 5389opname (int idx)
5411{ 5390{
5412 const char *name = opnames; 5391 const char *name = opnames;
5413 5392
5414 /* should do this at compile time, but would require external program, right? */ 5393 /* should do this at compile time, but would require external program, right? */
… …
5416 name += strlen (name) + 1; 5395 name += strlen (name) + 1;
5417 5396
5418 return *name ? name : "ILLEGAL"; 5397 return *name ? name : "ILLEGAL";
5419} 5398}
5420 5399
5421static const char * 5400ecb_cold static const char *
5422procname (pointer x) 5401procname (pointer x)
5423{ 5402{
5424 return opname (procnum (x)); 5403 return opname (procnum (x));
5425} 5404}
5426 5405
… …
5446#undef OP_DEF 5425#undef OP_DEF
5447 {0} 5426 {0}
5448}; 5427};
5449 5428
5450/* kernel of this interpreter */ 5429/* kernel of this interpreter */
5451static void ecb_hot 5430ecb_hot static void
5452Eval_Cycle (SCHEME_P_ enum scheme_opcodes op) 5431Eval_Cycle (SCHEME_P_ enum scheme_opcodes op)
5453{ 5432{
5454 SCHEME_V->op = op; 5433 SCHEME_V->op = op;
5455 5434
5456 for (;;) 5435 for (;;)
… …
5539 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0)) 5518 if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5540 return; 5519 return;
5541 5520
5542 if (SCHEME_V->no_memory && USE_ERROR_CHECKING) 5521 if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5543 { 5522 {
5544 xwrstr ("No memory!\n"); 5523 putstr (SCHEME_A_ "No memory!\n");
5545 return; 5524 return;
5546 } 5525 }
5547 } 5526 }
5548} 5527}
5549 5528
5550/* ========== Initialization of internal keywords ========== */ 5529/* ========== Initialization of internal keywords ========== */
5551 5530
5552static void 5531ecb_cold static void
5553assign_syntax (SCHEME_P_ const char *name) 5532assign_syntax (SCHEME_P_ const char *name)
5554{ 5533{
5555 pointer x = oblist_add_by_name (SCHEME_A_ name); 5534 pointer x = oblist_add_by_name (SCHEME_A_ name);
5556 set_typeflag (x, typeflag (x) | T_SYNTAX); 5535 set_typeflag (x, typeflag (x) | T_SYNTAX);
5557} 5536}
5558 5537
5559static void 5538ecb_cold static void
5560assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name) 5539assign_proc (SCHEME_P_ enum scheme_opcodes op, const char *name)
5561{ 5540{
5562 pointer x = mk_symbol (SCHEME_A_ name); 5541 pointer x = mk_symbol (SCHEME_A_ name);
5563 pointer y = mk_proc (SCHEME_A_ op); 5542 pointer y = mk_proc (SCHEME_A_ op);
5564 new_slot_in_env (SCHEME_A_ x, y); 5543 new_slot_in_env (SCHEME_A_ x, y);
… …
5572 ivalue_unchecked (y) = op; 5551 ivalue_unchecked (y) = op;
5573 return y; 5552 return y;
5574} 5553}
5575 5554
5576/* 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! */
5577static int 5556ecb_hot static int
5578syntaxnum (pointer p) 5557syntaxnum (pointer p)
5579{ 5558{
5580 const char *s = strvalue (p); 5559 const char *s = strvalue (p);
5581 5560
5582 switch (strlength (p)) 5561 switch (strlength (p))
… …
5662ecb_cold int 5641ecb_cold int
5663scheme_init (SCHEME_P) 5642scheme_init (SCHEME_P)
5664{ 5643{
5665 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]); 5644 int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5666 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));
5667 5652
5668 num_set_fixnum (num_zero, 1); 5653 num_set_fixnum (num_zero, 1);
5669 num_set_ivalue (num_zero, 0); 5654 num_set_ivalue (num_zero, 0);
5670 num_set_fixnum (num_one, 1); 5655 num_set_fixnum (num_one, 1);
5671 num_set_ivalue (num_one, 1); 5656 num_set_ivalue (num_one, 1);
… …
5683 SCHEME_V->save_inport = NIL; 5668 SCHEME_V->save_inport = NIL;
5684 SCHEME_V->loadport = NIL; 5669 SCHEME_V->loadport = NIL;
5685 SCHEME_V->nesting = 0; 5670 SCHEME_V->nesting = 0;
5686 SCHEME_V->interactive_repl = 0; 5671 SCHEME_V->interactive_repl = 0;
5687 5672
5688 if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS) 5673 if (!alloc_cellseg (SCHEME_A))
5689 { 5674 {
5690#if USE_ERROR_CHECKING 5675#if USE_ERROR_CHECKING
5691 SCHEME_V->no_memory = 1; 5676 SCHEME_V->no_memory = 1;
5692 return 0; 5677 return 0;
5693#endif 5678#endif
… …
5761 5746
5762 return !SCHEME_V->no_memory; 5747 return !SCHEME_V->no_memory;
5763} 5748}
5764 5749
5765#if USE_PORTS 5750#if USE_PORTS
5766void 5751ecb_cold void
5767scheme_set_input_port_file (SCHEME_P_ int fin) 5752scheme_set_input_port_file (SCHEME_P_ int fin)
5768{ 5753{
5769 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input); 5754 SCHEME_V->inport = port_from_file (SCHEME_A_ fin, port_input);
5770} 5755}
5771 5756
5772void 5757ecb_cold void
5773scheme_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)
5774{ 5759{
5775 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);
5776} 5761}
5777 5762
5778void 5763ecb_cold void
5779scheme_set_output_port_file (SCHEME_P_ int fout) 5764scheme_set_output_port_file (SCHEME_P_ int fout)
5780{ 5765{
5781 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output); 5766 SCHEME_V->outport = port_from_file (SCHEME_A_ fout, port_output);
5782} 5767}
5783 5768
5784void 5769ecb_cold void
5785scheme_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)
5786{ 5771{
5787 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);
5788} 5773}
5789#endif 5774#endif
5790 5775
5791void 5776ecb_cold void
5792scheme_set_external_data (SCHEME_P_ void *p) 5777scheme_set_external_data (SCHEME_P_ void *p)
5793{ 5778{
5794 SCHEME_V->ext_data = p; 5779 SCHEME_V->ext_data = p;
5795} 5780}
5796 5781
… …
5844 } 5829 }
5845 } 5830 }
5846#endif 5831#endif
5847} 5832}
5848 5833
5849void 5834ecb_cold void
5850scheme_load_file (SCHEME_P_ int fin) 5835scheme_load_file (SCHEME_P_ int fin)
5851{ 5836{
5852 scheme_load_named_file (SCHEME_A_ fin, 0); 5837 scheme_load_named_file (SCHEME_A_ fin, 0);
5853} 5838}
5854 5839
5855void 5840ecb_cold void
5856scheme_load_named_file (SCHEME_P_ int fin, const char *filename) 5841scheme_load_named_file (SCHEME_P_ int fin, const char *filename)
5857{ 5842{
5858 dump_stack_reset (SCHEME_A); 5843 dump_stack_reset (SCHEME_A);
5859 SCHEME_V->envir = SCHEME_V->global_env; 5844 SCHEME_V->envir = SCHEME_V->global_env;
5860 SCHEME_V->file_i = 0; 5845 SCHEME_V->file_i = 0;
… …
5887 5872
5888 if (SCHEME_V->retcode == 0) 5873 if (SCHEME_V->retcode == 0)
5889 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5874 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5890} 5875}
5891 5876
5892void 5877ecb_cold void
5893scheme_load_string (SCHEME_P_ const char *cmd) 5878scheme_load_string (SCHEME_P_ const char *cmd)
5894{ 5879{
5895 dump_stack_reset (SCHEME_A); 5880 dump_stack_reset (SCHEME_A);
5896 SCHEME_V->envir = SCHEME_V->global_env; 5881 SCHEME_V->envir = SCHEME_V->global_env;
5897 SCHEME_V->file_i = 0; 5882 SCHEME_V->file_i = 0;
… …
5911 5896
5912 if (SCHEME_V->retcode == 0) 5897 if (SCHEME_V->retcode == 0)
5913 SCHEME_V->retcode = SCHEME_V->nesting != 0; 5898 SCHEME_V->retcode = SCHEME_V->nesting != 0;
5914} 5899}
5915 5900
5916void 5901ecb_cold void
5917scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value) 5902scheme_define (SCHEME_P_ pointer envir, pointer symbol, pointer value)
5918{ 5903{
5919 pointer x; 5904 pointer x;
5920 5905
5921 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0); 5906 x = find_slot_in_env (SCHEME_A_ envir, symbol, 0);
… …
5926 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value); 5911 new_slot_spec_in_env (SCHEME_A_ envir, symbol, value);
5927} 5912}
5928 5913
5929#if !STANDALONE 5914#if !STANDALONE
5930 5915
5931void 5916ecb_cold void
5932scheme_register_foreign_func (scheme * sc, scheme_registerable * sr) 5917scheme_register_foreign_func (scheme * sc, scheme_registerable * sr)
5933{ 5918{
5934 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));
5935} 5920}
5936 5921
5937void 5922ecb_cold void
5938scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count) 5923scheme_register_foreign_func_list (scheme * sc, scheme_registerable * list, int count)
5939{ 5924{
5940 int i; 5925 int i;
5941 5926
5942 for (i = 0; i < count; i++) 5927 for (i = 0; i < count; i++)
5943 scheme_register_foreign_func (SCHEME_A_ list + i); 5928 scheme_register_foreign_func (SCHEME_A_ list + i);
5944} 5929}
5945 5930
5946pointer 5931ecb_cold pointer
5947scheme_apply0 (SCHEME_P_ const char *procname) 5932scheme_apply0 (SCHEME_P_ const char *procname)
5948{ 5933{
5949 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));
5950} 5935}
5951 5936
5952void 5937ecb_cold void
5953save_from_C_call (SCHEME_P) 5938save_from_C_call (SCHEME_P)
5954{ 5939{
5955 pointer saved_data = cons (car (S_SINK), 5940 pointer saved_data = cons (car (S_SINK),
5956 cons (SCHEME_V->envir, 5941 cons (SCHEME_V->envir,
5957 SCHEME_V->dump)); 5942 SCHEME_V->dump));
… …
5961 /* 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
5962 directly resume pre-C-call operations. */ 5947 directly resume pre-C-call operations. */
5963 dump_stack_reset (SCHEME_A); 5948 dump_stack_reset (SCHEME_A);
5964} 5949}
5965 5950
5966void 5951ecb_cold void
5967restore_from_C_call (SCHEME_P) 5952restore_from_C_call (SCHEME_P)
5968{ 5953{
5969 set_car (S_SINK, caar (SCHEME_V->c_nest)); 5954 set_car (S_SINK, caar (SCHEME_V->c_nest));
5970 SCHEME_V->envir = cadar (SCHEME_V->c_nest); 5955 SCHEME_V->envir = cadar (SCHEME_V->c_nest);
5971 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest)); 5956 SCHEME_V->dump = cdr (cdar (SCHEME_V->c_nest));
5972 /* Pop */ 5957 /* Pop */
5973 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest); 5958 SCHEME_V->c_nest = cdr (SCHEME_V->c_nest);
5974} 5959}
5975 5960
5976/* "func" and "args" are assumed to be already eval'ed. */ 5961/* "func" and "args" are assumed to be already eval'ed. */
5977pointer 5962ecb_cold pointer
5978scheme_call (SCHEME_P_ pointer func, pointer args) 5963scheme_call (SCHEME_P_ pointer func, pointer args)
5979{ 5964{
5980 int old_repl = SCHEME_V->interactive_repl; 5965 int old_repl = SCHEME_V->interactive_repl;
5981 5966
5982 SCHEME_V->interactive_repl = 0; 5967 SCHEME_V->interactive_repl = 0;
… …
5989 SCHEME_V->interactive_repl = old_repl; 5974 SCHEME_V->interactive_repl = old_repl;
5990 restore_from_C_call (SCHEME_A); 5975 restore_from_C_call (SCHEME_A);
5991 return SCHEME_V->value; 5976 return SCHEME_V->value;
5992} 5977}
5993 5978
5994pointer 5979ecb_cold pointer
5995scheme_eval (SCHEME_P_ pointer obj) 5980scheme_eval (SCHEME_P_ pointer obj)
5996{ 5981{
5997 int old_repl = SCHEME_V->interactive_repl; 5982 int old_repl = SCHEME_V->interactive_repl;
5998 5983
5999 SCHEME_V->interactive_repl = 0; 5984 SCHEME_V->interactive_repl = 0;
… …
6011 5996
6012/* ========== Main ========== */ 5997/* ========== Main ========== */
6013 5998
6014#if STANDALONE 5999#if STANDALONE
6015 6000
6016int 6001ecb_cold int
6017main (int argc, char **argv) 6002main (int argc, char **argv)
6018{ 6003{
6019# if USE_MULTIPLICITY 6004# if USE_MULTIPLICITY
6020 scheme ssc; 6005 scheme ssc;
6021 scheme *const SCHEME_V = &ssc; 6006 scheme *const SCHEME_V = &ssc;
… …
6027 int isfile = 1; 6012 int isfile = 1;
6028 system ("ps v $PPID");//D 6013 system ("ps v $PPID");//D
6029 6014
6030 if (argc == 2 && strcmp (argv[1], "-?") == 0) 6015 if (argc == 2 && strcmp (argv[1], "-?") == 0)
6031 { 6016 {
6032 xwrstr ("Usage: tinyscheme -?\n"); 6017 putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
6033 xwrstr ("or: tinyscheme [<file1> <file2> ...]\n"); 6018 putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
6034 xwrstr ("followed by\n"); 6019 putstr (SCHEME_A_ "followed by\n");
6035 xwrstr (" -1 <file> [<arg1> <arg2> ...]\n"); 6020 putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6036 xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n"); 6021 putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6037 xwrstr ("assuming that the executable is named tinyscheme.\n"); 6022 putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6038 xwrstr ("Use - as filename for stdin.\n"); 6023 putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6039 return 1; 6024 return 1;
6040 } 6025 }
6041 6026
6042 if (!scheme_init (SCHEME_A)) 6027 if (!scheme_init (SCHEME_A))
6043 { 6028 {
6044 xwrstr ("Could not initialize!\n"); 6029 putstr (SCHEME_A_ "Could not initialize!\n");
6045 return 2; 6030 return 2;
6046 } 6031 }
6047 6032
6048# if USE_PORTS 6033# if USE_PORTS
6049 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO); 6034 scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
… …
6094 fin = open (file_name, O_RDONLY); 6079 fin = open (file_name, O_RDONLY);
6095#endif 6080#endif
6096 6081
6097 if (isfile && fin < 0) 6082 if (isfile && fin < 0)
6098 { 6083 {
6099 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");
6100 } 6085 }
6101 else 6086 else
6102 { 6087 {
6103 if (isfile) 6088 if (isfile)
6104 scheme_load_named_file (SCHEME_A_ fin, file_name); 6089 scheme_load_named_file (SCHEME_A_ fin, file_name);
… …
6108#if USE_PORTS 6093#if USE_PORTS
6109 if (!isfile || fin != STDIN_FILENO) 6094 if (!isfile || fin != STDIN_FILENO)
6110 { 6095 {
6111 if (SCHEME_V->retcode != 0) 6096 if (SCHEME_V->retcode != 0)
6112 { 6097 {
6113 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");
6114 } 6099 }
6115 6100
6116 if (isfile) 6101 if (isfile)
6117 close (fin); 6102 close (fin);
6118 } 6103 }

Diff Legend

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