[ViewVC] Diff of: cvs/cvsroot/microscheme/scheme.c

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.44 by root, Mon Nov 30 06:49:11 2015 UTC vs.
Revision 1.55 by root, Tue Dec 1 03:03:11 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
91	static scheme sc;	93	static scheme sc;
92	#endif	94	#endif
93		95
…		…
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
…		…
121	{	123	{
122	xbase (s, n, 10);	124	xbase (s, n, 10);
123	}	125	}
124		126
125	static void	127	static void
126	xwrstr (const char *s)	128	putnum (SCHEME_P_ long n)
127	{
128	write (1, s, strlen (s));
129	}
130
131	static void
132	xwrnum (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
140	static char	136	static char
141	xtoupper (char c)	137	xtoupper (char c)
142	{	138	{
…		…
192	# define prompt "ts> "	188	# define prompt "ts> "
193	#endif	189	#endif
194		190
195	#ifndef InitFile	191	#ifndef InitFile
196	# define InitFile "init.scm"	192	# define InitFile "init.scm"
197	#endif
198
199	#ifndef FIRST_CELLSEGS
200	# define FIRST_CELLSEGS 3
201	#endif	193	#endif
202		194
203	enum scheme_types	195	enum scheme_types
204	{	196	{
205	T_INTEGER,	197	T_INTEGER,
…		…
258	static num num_op (enum num_op op, num a, num b);	250	static num num_op (enum num_op op, num a, num b);
259	static num num_intdiv (num a, num b);	251	static num num_intdiv (num a, num b);
260	static num num_rem (num a, num b);	252	static num num_rem (num a, num b);
261	static num num_mod (num a, num b);	253	static num num_mod (num a, num b);
262		254
263	#if USE_MATH
264	static double round_per_R5RS (double x);
265	#endif
266	static int is_zero_rvalue (RVALUE x);	255	static int is_zero_rvalue (RVALUE x);
267		256
268	static num num_zero;	257	static num num_zero;
269	static num num_one;	258	static 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
276	INTERFACE int	269	INTERFACE int
277	is_string (pointer p)	270	is_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
285	INTERFACE int	278	INTERFACE int
286	is_vector (pointer p)	279	is_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)
293	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);	286	INTERFACE void fill_vector (pointer vec, uint32_t start, pointer obj);
294	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);	287	INTERFACE pointer vector_get (pointer vec, uint32_t ielem);
295	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);	288	INTERFACE void vector_set (pointer vec, uint32_t ielem, pointer a);
296		289
297	INTERFACE int	290	INTERFACE int
…		…
323	string_value (pointer p)	316	string_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
339	INTERFACE long	332	INTERFACE long
340	charvalue (pointer p)	333	charvalue (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)
345	INTERFACE int	340	INTERFACE int
346	is_port (pointer p)	341	is_port (pointer p)
347	{	342	{
348	return type (p) == T_PORT;	343	return type (p) == T_PORT;
349	}	344	}
350		345
351	INTERFACE int	346	INTERFACE int
352	is_inport (pointer p)	347	is_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
357	INTERFACE int	352	INTERFACE int
358	is_outport (pointer p)	353	is_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
363	INTERFACE int	358	INTERFACE int
364	is_pair (pointer p)	359	is_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
372	static pointer caar (pointer p) { return car (car (p)); }	367	static pointer caar (pointer p) { return car (car (p)); }
373	static pointer cadr (pointer p) { return car (cdr (p)); }	368	static pointer cadr (pointer p) { return car (cdr (p)); }
374	static pointer cdar (pointer p) { return cdr (car (p)); }	369	static pointer cdar (pointer p) { return cdr (car (p)); }
375	static pointer cddr (pointer p) { return cdr (cdr (p)); }	370	static pointer cddr (pointer p) { return cdr (cdr (p)); }
…		…
379	static pointer cdaar (pointer p) { return cdr (car (car (p))); }	374	static pointer cdaar (pointer p) { return cdr (car (car (p))); }
380		375
381	INTERFACE void	376	INTERFACE void
382	set_car (pointer p, pointer q)	377	set_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
387	INTERFACE void	382	INTERFACE void
388	set_cdr (pointer p, pointer q)	383	set_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
393	INTERFACE pointer	388	INTERFACE pointer
394	pair_car (pointer p)	389	pair_car (pointer p)
395	{	390	{
…		…
413	{	408	{
414	return strvalue (p);	409	return strvalue (p);
415	}	410	}
416		411
417	#if USE_PLIST	412	#if USE_PLIST
		413	#error plists are broken because symbols are no longer pairs
418	#define symprop(p) cdr(p)	414	#define symprop(p) cdr(p)
419	SCHEME_EXPORT int	415	SCHEME_EXPORT int
420	hasprop (pointer p)	416	hasprop (pointer p)
421	{	417	{
422	return typeflag (p) & T_SYMBOL;	418	return typeflag (p) & T_SYMBOL;
…		…
669		665
670	static int file_push (SCHEME_P_ const char *fname);	666	static int file_push (SCHEME_P_ const char *fname);
671	static void file_pop (SCHEME_P);	667	static void file_pop (SCHEME_P);
672	static int file_interactive (SCHEME_P);	668	static int file_interactive (SCHEME_P);
673	ecb_inline int is_one_of (const char *s, int c);	669	ecb_inline int is_one_of (const char *s, int c);
674	static int alloc_cellseg (SCHEME_P_ int n);	670	static int alloc_cellseg (SCHEME_P);
675	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);	671	ecb_inline pointer get_cell (SCHEME_P_ pointer a, pointer b);
676	static void finalize_cell (SCHEME_P_ pointer a);	672	static void finalize_cell (SCHEME_P_ pointer a);
677	static int count_consecutive_cells (pointer x, int needed);	673	static int count_consecutive_cells (pointer x, int needed);
678	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);	674	static pointer find_slot_in_env (SCHEME_P_ pointer env, pointer sym, int all);
679	static pointer mk_number (SCHEME_P_ const num n);	675	static pointer mk_number (SCHEME_P_ const num n);
…		…
873	}	869	}
874		870
875	return ret;	871	return ret;
876	}	872	}
877		873
878	#if USE_MATH
879
880	/* Round to nearest. Round to even if midway */
881	static double
882	round_per_R5RS (double x)
883	{
884	double fl = floor (x);
885	double ce = ceil (x);
886	double dfl = x - fl;
887	double dce = ce - x;
888
889	if (dfl > dce)
890	return ce;
891	else if (dfl < dce)
892	return fl;
893	else
894	{
895	if (fmod (fl, 2) == 0) /* I imagine this holds */
896	return fl;
897	else
898	return ce;
899	}
900	}
901	#endif
902
903	static int	874	static int
904	is_zero_rvalue (RVALUE x)	875	is_zero_rvalue (RVALUE x)
905	{	876	{
906	return x == 0;	877	return x == 0;
907	#if 0	878	#if 0
…		…
913	#endif	884	#endif
914	}	885	}
915		886
916	/* allocate new cell segment */	887	/* allocate new cell segment */
917	static int	888	static int
918	alloc_cellseg (SCHEME_P_ int n)	889	alloc_cellseg (SCHEME_P)
919	{	890	{
920	pointer newp;	891	struct cell *newp;
921	pointer last;	892	struct cell *last;
922	pointer p;	893	struct cell *p;
923	char *cp;	894	char *cp;
924	long i;	895	long i;
925	int k;	896	int k;
926		897
927	static int segsize = CELL_SEGSIZE >> 1;	898	static int segsize = CELL_SEGSIZE >> 1;
928	segsize <<= 1;	899	segsize <<= 1;
929		900
930	for (k = 0; k < n; k++)
931	{
932	if (SCHEME_V->last_cell_seg >= CELL_NSEGMENT - 1)
933	return k;
934
935	cp = malloc (segsize * sizeof (struct cell));	901	cp = malloc (segsize * sizeof (struct cell));
936		902
937	if (!cp && USE_ERROR_CHECKING)	903	if (!cp && USE_ERROR_CHECKING)
938	return k;	904	return k;
939		905
940	i = ++SCHEME_V->last_cell_seg;	906	i = ++SCHEME_V->last_cell_seg;
941	SCHEME_V->alloc_seg[i] = cp;	907	SCHEME_V->alloc_seg[i] = cp;
942		908
943	newp = (pointer)cp;	909	newp = (struct cell *)cp;
944	SCHEME_V->cell_seg[i] = newp;	910	SCHEME_V->cell_seg[i] = newp;
945	SCHEME_V->cell_segsize[i] = segsize;	911	SCHEME_V->cell_segsize[i] = segsize;
946	SCHEME_V->fcells += segsize;	912	SCHEME_V->fcells += segsize;
947	last = newp + segsize - 1;	913	last = newp + segsize - 1;
948		914
949	for (p = newp; p <= last; p++)	915	for (p = newp; p <= last; p++)
950	{	916	{
		917	pointer cp = POINTER (p);
951	set_typeflag (p, T_PAIR);	918	set_typeflag (cp, T_PAIR);
952	set_car (p, NIL);	919	set_car (cp, NIL);
953	set_cdr (p, p + 1);	920	set_cdr (cp, POINTER (p + 1));
954	}	921	}
955		922
956	set_cdr (last, SCHEME_V->free_cell);	923	set_cdr (POINTER (last), SCHEME_V->free_cell);
957	SCHEME_V->free_cell = newp;	924	SCHEME_V->free_cell = POINTER (newp);
958	}
959		925
960	return n;	926	return 1;
961	}	927	}
962		928
963	/* get new cell. parameter a, b is marked by gc. */	929	/* get new cell. parameter a, b is marked by gc. */
964	ecb_inline pointer	930	ecb_inline pointer
965	get_cell_x (SCHEME_P_ pointer a, pointer b)	931	get_cell_x (SCHEME_P_ pointer a, pointer b)
…		…
969	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	935	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
970	return S_SINK;	936	return S_SINK;
971		937
972	if (SCHEME_V->free_cell == NIL)	938	if (SCHEME_V->free_cell == NIL)
973	{	939	{
974	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;
975		941
976	gc (SCHEME_A_ a, b);	942	gc (SCHEME_A_ a, b);
977		943
978	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)
979	{	945	{
980	/* 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 */
981	if (!alloc_cellseg (SCHEME_A_ 1) && SCHEME_V->free_cell == NIL)	947	if (!alloc_cellseg (SCHEME_A) && SCHEME_V->free_cell == NIL)
982	{	948	{
983	#if USE_ERROR_CHECKING	949	#if USE_ERROR_CHECKING
984	SCHEME_V->no_memory = 1;	950	SCHEME_V->no_memory = 1;
985	return S_SINK;	951	return S_SINK;
986	#endif	952	#endif
…		…
998	}	964	}
999	}	965	}
1000		966
1001	/* To retain recent allocs before interpreter knows about them -	967	/* To retain recent allocs before interpreter knows about them -
1002	Tehom */	968	Tehom */
1003
1004	static void	969	static void
1005	push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)	970	push_recent_alloc (SCHEME_P_ pointer recent, pointer extra)
1006	{	971	{
1007	pointer holder = get_cell_x (SCHEME_A_ recent, extra);	972	pointer holder = get_cell_x (SCHEME_A_ recent, extra);
1008		973
…		…
1030	}	995	}
1031		996
1032	static pointer	997	static pointer
1033	get_vector_object (SCHEME_P_ uint32_t len, pointer init)	998	get_vector_object (SCHEME_P_ uint32_t len, pointer init)
1034	{	999	{
1035	pointer v = get_cell_x (SCHEME_A_ 0, 0);	1000	pointer v = get_cell_x (SCHEME_A_ NIL, NIL);
1036	pointer e = malloc (len sizeof (pointer));	1001	pointer e = malloc (len sizeof (pointer));
1037		1002
1038	if (!e && USE_ERROR_CHECKING)	1003	if (!e && USE_ERROR_CHECKING)
1039	return S_SINK;	1004	return S_SINK;
1040		1005
1041	/* Record it as a vector so that gc understands it. */	1006	/* Record it as a vector so that gc understands it. */
1042	set_typeflag (v, T_VECTOR \| T_ATOM);	1007	set_typeflag (v, T_VECTOR \| T_ATOM);
1043		1008
1044	v->object.vector.vvalue = e;	1009	CELL(v)->object.vector.vvalue = e;
1045	v->object.vector.length = len;	1010	CELL(v)->object.vector.length = len;
1046	fill_vector (v, 0, init);	1011	fill_vector (v, 0, init);
1047	push_recent_alloc (SCHEME_A_ v, NIL);	1012	push_recent_alloc (SCHEME_A_ v, NIL);
1048		1013
1049	return v;	1014	return v;
1050	}	1015	}
…		…
1059	static void	1024	static void
1060	check_cell_alloced (pointer p, int expect_alloced)	1025	check_cell_alloced (pointer p, int expect_alloced)
1061	{	1026	{
1062	/* 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. */
1063	if (typeflag (p) & !expect_alloced)	1028	if (typeflag (p) & !expect_alloced)
1064	xwrstr ("Cell is already allocated!\n");	1029	putstr (SCHEME_A_ "Cell is already allocated!\n");
1065		1030
1066	if (!(typeflag (p)) & expect_alloced)	1031	if (!(typeflag (p)) & expect_alloced)
1067	xwrstr ("Cell is not allocated!\n");	1032	putstr (SCHEME_A_ "Cell is not allocated!\n");
1068	}	1033	}
1069		1034
1070	static void	1035	static void
1071	check_range_alloced (pointer p, int n, int expect_alloced)	1036	check_range_alloced (pointer p, int n, int expect_alloced)
1072	{	1037	{
…		…
1200		1165
1201	/* returns the new symbol */	1166	/* returns the new symbol */
1202	static pointer	1167	static pointer
1203	oblist_add_by_name (SCHEME_P_ const char *name)	1168	oblist_add_by_name (SCHEME_P_ const char *name)
1204	{	1169	{
1205	pointer x = mk_string (SCHEME_A_ name);	1170	pointer x = generate_symbol (SCHEME_A_ name);
1206	set_typeflag (x, T_SYMBOL);
1207	setimmutable (x);
1208	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);	1171	SCHEME_V->oblist = immutable_cons (x, SCHEME_V->oblist);
1209	return x;	1172	return x;
1210	}	1173	}
1211		1174
1212	static pointer	1175	static pointer
…		…
1222	mk_port (SCHEME_P_ port *p)	1185	mk_port (SCHEME_P_ port *p)
1223	{	1186	{
1224	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1187	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1225		1188
1226	set_typeflag (x, T_PORT \| T_ATOM);	1189	set_typeflag (x, T_PORT \| T_ATOM);
1227	x->object.port = p;	1190	set_port (x, p);
1228		1191
1229	return x;	1192	return x;
1230	}	1193	}
1231	#endif	1194	#endif
1232		1195
1233	pointer	1196	pointer
1234	mk_foreign_func (SCHEME_P_ foreign_func f)	1197	mk_foreign_func (SCHEME_P_ foreign_func f)
1235	{	1198	{
1236	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1199	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1237		1200
1238	set_typeflag (x, (T_FOREIGN \| T_ATOM));	1201	set_typeflag (x, T_FOREIGN \| T_ATOM);
1239	x->object.ff = f;	1202	CELL(x)->object.ff = f;
1240		1203
1241	return x;	1204	return x;
1242	}	1205	}
1243		1206
1244	INTERFACE pointer	1207	INTERFACE pointer
1245	mk_character (SCHEME_P_ int c)	1208	mk_character (SCHEME_P_ int c)
1246	{	1209	{
1247	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1210	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1248		1211
1249	set_typeflag (x, (T_CHARACTER \| T_ATOM));	1212	set_typeflag (x, T_CHARACTER \| T_ATOM);
1250	set_ivalue (x, c & 0xff);	1213	set_ivalue (x, c & 0xff);
1251		1214
1252	return x;	1215	return x;
1253	}	1216	}
1254		1217
1255	/* get number atom (integer) */	1218	/* get number atom (integer) */
1256	INTERFACE pointer	1219	INTERFACE pointer
1257	mk_integer (SCHEME_P_ long n)	1220	mk_integer (SCHEME_P_ long n)
1258	{	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	{
1259	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1232	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1260		1233
1261	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 */
1262	set_ivalue (x, n);	1236	set_ivalue (x, n);
1263		1237
		1238	*pp = x;
		1239	}
		1240
1264	return x;	1241	return *pp;
1265	}	1242	}
1266		1243
1267	INTERFACE pointer	1244	INTERFACE pointer
1268	mk_real (SCHEME_P_ RVALUE n)	1245	mk_real (SCHEME_P_ RVALUE n)
1269	{	1246	{
1270	#if USE_REAL	1247	#if USE_REAL
1271	pointer x = get_cell (SCHEME_A_ NIL, NIL);	1248	pointer x = get_cell (SCHEME_A_ NIL, NIL);
1272		1249
1273	set_typeflag (x, (T_REAL \| T_ATOM));	1250	set_typeflag (x, T_REAL \| T_ATOM);
1274	set_rvalue (x, n);	1251	set_rvalue (x, n);
1275		1252
1276	return x;	1253	return x;
1277	#else	1254	#else
1278	return mk_integer (SCHEME_A_ n);	1255	return mk_integer (SCHEME_A_ n);
…		…
1621		1598
1622	/* garbage collection. parameter a, b is marked. */	1599	/* garbage collection. parameter a, b is marked. */
1623	static void	1600	static void
1624	gc (SCHEME_P_ pointer a, pointer b)	1601	gc (SCHEME_P_ pointer a, pointer b)
1625	{	1602	{
1626	pointer p;
1627	int i;	1603	int i;
1628		1604
1629	if (SCHEME_V->gc_verbose)	1605	if (SCHEME_V->gc_verbose)
1630	putstr (SCHEME_A_ "gc...");	1606	putstr (SCHEME_A_ "gc...");
1631		1607
…		…
1647	/* Mark recent objects the interpreter doesn't know about yet. */	1623	/* Mark recent objects the interpreter doesn't know about yet. */
1648	mark (car (S_SINK));	1624	mark (car (S_SINK));
1649	/* Mark any older stuff above nested C calls */	1625	/* Mark any older stuff above nested C calls */
1650	mark (SCHEME_V->c_nest);	1626	mark (SCHEME_V->c_nest);
1651		1627
		1628	#if USE_INTCACHE
		1629	/* mark intcache */
		1630	for (i = INTCACHE_MIN; i <= INTCACHE_MAX; ++i)
		1631	if (SCHEME_V->intcache[i - INTCACHE_MIN])
		1632	mark (SCHEME_V->intcache[i - INTCACHE_MIN]);
		1633	#endif
		1634
1652	/* mark variables a, b */	1635	/* mark variables a, b */
1653	mark (a);	1636	mark (a);
1654	mark (b);	1637	mark (b);
1655		1638
1656	/* garbage collect */	1639	/* garbage collect */
1657	clrmark (NIL);	1640	clrmark (NIL);
1658	SCHEME_V->fcells = 0;	1641	SCHEME_V->fcells = 0;
1659	SCHEME_V->free_cell = NIL;	1642	SCHEME_V->free_cell = NIL;
1660		1643
		1644	if (SCHEME_V->gc_verbose)
		1645	putstr (SCHEME_A_ "freeing...");
		1646
1661	uint32_t total = 0;	1647	uint32_t total = 0;
1662		1648
1663	/* Here we scan the cells to build the free-list. */	1649	/* Here we scan the cells to build the free-list. */
1664	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)	1650	for (i = SCHEME_V->last_cell_seg; i >= 0; i--)
1665	{	1651	{
1666	pointer end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];	1652	struct cell *end = SCHEME_V->cell_seg[i] + SCHEME_V->cell_segsize [i];
		1653	struct cell *p;
1667	total += SCHEME_V->cell_segsize [i];	1654	total += SCHEME_V->cell_segsize [i];
1668		1655
1669	for (p = SCHEME_V->cell_seg[i]; p < end; ++p)	1656	for (p = SCHEME_V->cell_seg[i]; p < end; ++p)
1670	{	1657	{
		1658	pointer c = POINTER (p);
		1659
1671	if (is_mark (p))	1660	if (is_mark (c))
1672	clrmark (p);	1661	clrmark (c);
1673	else	1662	else
1674	{	1663	{
1675	/* reclaim cell */	1664	/* reclaim cell */
1676	if (typeflag (p) != T_PAIR)	1665	if (typeflag (c) != T_PAIR)
1677	{	1666	{
1678	finalize_cell (SCHEME_A_ p);	1667	finalize_cell (SCHEME_A_ c);
1679	set_typeflag (p, T_PAIR);	1668	set_typeflag (c, T_PAIR);
1680	set_car (p, NIL);	1669	set_car (c, NIL);
1681	}	1670	}
1682		1671
1683	++SCHEME_V->fcells;	1672	++SCHEME_V->fcells;
1684	set_cdr (p, SCHEME_V->free_cell);	1673	set_cdr (c, SCHEME_V->free_cell);
1685	SCHEME_V->free_cell = p;	1674	SCHEME_V->free_cell = c;
1686	}	1675	}
1687	}	1676	}
1688	}	1677	}
1689		1678
1690	if (SCHEME_V->gc_verbose)	1679	if (SCHEME_V->gc_verbose)
1691	{	1680	{
1692	xwrstr ("done: "); xwrnum (SCHEME_V->fcells); xwrstr (" out of "); xwrnum (total); xwrstr (" cells were recovered.\n");	1681	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");
1693	}	1682	}
1694	}	1683	}
1695		1684
1696	static void	1685	static void
1697	finalize_cell (SCHEME_P_ pointer a)	1686	finalize_cell (SCHEME_P_ pointer a)
…		…
1702	else if (is_vector (a))	1691	else if (is_vector (a))
1703	free (vecvalue (a));	1692	free (vecvalue (a));
1704	#if USE_PORTS	1693	#if USE_PORTS
1705	else if (is_port (a))	1694	else if (is_port (a))
1706	{	1695	{
1707	if (a->object.port->kind & port_file && a->object.port->rep.stdio.closeit)	1696	if (port(a)->kind & port_file && port (a)->rep.stdio.closeit)
1708	port_close (SCHEME_A_ a, port_input \| port_output);	1697	port_close (SCHEME_A_ a, port_input \| port_output);
1709		1698
1710	free (a->object.port);	1699	free (port (a));
1711	}	1700	}
1712	#endif	1701	#endif
1713	}	1702	}
1714		1703
1715	/* ========== Routines for Reading ========== */	1704	/* ========== Routines for Reading ========== */
…		…
1731	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;	1720	SCHEME_V->load_stack[SCHEME_V->file_i].unget = -1;
1732	SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file \| port_input;	1721	SCHEME_V->load_stack[SCHEME_V->file_i].kind = port_file \| port_input;
1733	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;	1722	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.file = fin;
1734	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;	1723	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.closeit = 1;
1735	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;	1724	SCHEME_V->nesting_stack[SCHEME_V->file_i] = 0;
1736	SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i;	1725	set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1737		1726
1738	#if SHOW_ERROR_LINE	1727	#if SHOW_ERROR_LINE
1739	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;	1728	SCHEME_V->load_stack[SCHEME_V->file_i].rep.stdio.curr_line = 0;
1740		1729
1741	if (fname)	1730	if (fname)
…		…
1758	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];	1747	SCHEME_V->nesting = SCHEME_V->nesting_stack[SCHEME_V->file_i];
1759	#if USE_PORTS	1748	#if USE_PORTS
1760	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);	1749	port_close (SCHEME_A_ SCHEME_V->loadport, port_input);
1761	#endif	1750	#endif
1762	SCHEME_V->file_i--;	1751	SCHEME_V->file_i--;
1763	SCHEME_V->loadport->object.port = SCHEME_V->load_stack + SCHEME_V->file_i;	1752	set_port (SCHEME_V->loadport, SCHEME_V->load_stack + SCHEME_V->file_i);
1764	}	1753	}
1765	}	1754	}
1766		1755
1767	static int	1756	static int
1768	file_interactive (SCHEME_P)	1757	file_interactive (SCHEME_P)
1769	{	1758	{
1770	#if USE_PORTS	1759	#if USE_PORTS
1771	return SCHEME_V->file_i == 0	1760	return SCHEME_V->file_i == 0
1772	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO	1761	&& SCHEME_V->load_stack[0].rep.stdio.file == STDIN_FILENO
1773	&& (SCHEME_V->inport->object.port->kind & port_file);	1762	&& (port (SCHEME_V->inport)->kind & port_file);
1774	#else	1763	#else
1775	return 0;	1764	return 0;
1776	#endif	1765	#endif
1777	}	1766	}
1778		1767
…		…
1912	}	1901	}
1913		1902
1914	static void	1903	static void
1915	port_close (SCHEME_P_ pointer p, int flag)	1904	port_close (SCHEME_P_ pointer p, int flag)
1916	{	1905	{
1917	port *pt = p->object.port;	1906	port *pt = port (p);
1918		1907
1919	pt->kind &= ~flag;	1908	pt->kind &= ~flag;
1920		1909
1921	if ((pt->kind & (port_input \| port_output)) == 0)	1910	if ((pt->kind & (port_input \| port_output)) == 0)
1922	{	1911	{
…		…
1943	/* get new character from input file */	1932	/* get new character from input file */
1944	static int	1933	static int
1945	inchar (SCHEME_P)	1934	inchar (SCHEME_P)
1946	{	1935	{
1947	int c;	1936	int c;
1948	port *pt;	1937	port *pt = port (SCHEME_V->inport);
1949
1950	pt = SCHEME_V->inport->object.port;
1951		1938
1952	if (pt->kind & port_saw_EOF)	1939	if (pt->kind & port_saw_EOF)
1953	return EOF;	1940	return EOF;
1954		1941
1955	c = basic_inchar (pt);	1942	c = basic_inchar (pt);
…		…
2022	port *pt;	2009	port *pt;
2023		2010
2024	if (c == EOF)	2011	if (c == EOF)
2025	return;	2012	return;
2026		2013
2027	pt = SCHEME_V->inport->object.port;	2014	pt = port (SCHEME_V->inport);
2028	pt->unget = c;	2015	pt->unget = c;
2029	#else	2016	#else
2030	if (c == EOF)	2017	if (c == EOF)
2031	return;	2018	return;
2032		2019
…		…
2060		2047
2061	INTERFACE void	2048	INTERFACE void
2062	putstr (SCHEME_P_ const char *s)	2049	putstr (SCHEME_P_ const char *s)
2063	{	2050	{
2064	#if USE_PORTS	2051	#if USE_PORTS
2065	port *pt = SCHEME_V->outport->object.port;	2052	port *pt = port (SCHEME_V->outport);
2066		2053
2067	if (pt->kind & port_file)	2054	if (pt->kind & port_file)
2068	write (pt->rep.stdio.file, s, strlen (s));	2055	write (pt->rep.stdio.file, s, strlen (s));
2069	else	2056	else
2070	for (; *s; s++)	2057	for (; *s; s++)
…		…
2072	pt->rep.string.curr++ = s;	2059	pt->rep.string.curr++ = s;
2073	else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))	2060	else if (pt->kind & port_srfi6 && realloc_port_string (SCHEME_A_ pt))
2074	pt->rep.string.curr++ = s;	2061	pt->rep.string.curr++ = s;
2075		2062
2076	#else	2063	#else
2077	xwrstr (s);	2064	write (pt->rep.stdio.file, s, strlen (s));
2078	#endif	2065	#endif
2079	}	2066	}
2080		2067
2081	static void	2068	static void
2082	putchars (SCHEME_P_ const char *s, int len)	2069	putchars (SCHEME_P_ const char *s, int len)
2083	{	2070	{
2084	#if USE_PORTS	2071	#if USE_PORTS
2085	port *pt = SCHEME_V->outport->object.port;	2072	port *pt = port (SCHEME_V->outport);
2086		2073
2087	if (pt->kind & port_file)	2074	if (pt->kind & port_file)
2088	write (pt->rep.stdio.file, s, len);	2075	write (pt->rep.stdio.file, s, len);
2089	else	2076	else
2090	{	2077	{
…		…
2104		2091
2105	INTERFACE void	2092	INTERFACE void
2106	putcharacter (SCHEME_P_ int c)	2093	putcharacter (SCHEME_P_ int c)
2107	{	2094	{
2108	#if USE_PORTS	2095	#if USE_PORTS
2109	port *pt = SCHEME_V->outport->object.port;	2096	port *pt = port (SCHEME_V->outport);
2110		2097
2111	if (pt->kind & port_file)	2098	if (pt->kind & port_file)
2112	{	2099	{
2113	char cc = c;	2100	char cc = c;
2114	write (pt->rep.stdio.file, &cc, 1);	2101	write (pt->rep.stdio.file, &cc, 1);
…		…
3056	{	3043	{
3057	int nframes = (uintptr_t)SCHEME_V->dump;	3044	int nframes = (uintptr_t)SCHEME_V->dump;
3058	struct dump_stack_frame *next_frame;	3045	struct dump_stack_frame *next_frame;
3059		3046
3060	/* enough room for the next frame? */	3047	/* enough room for the next frame? */
3061	if (nframes >= SCHEME_V->dump_size)	3048	if (ecb_expect_false (nframes >= SCHEME_V->dump_size))
3062	{	3049	{
3063	SCHEME_V->dump_size += STACK_GROWTH;	3050	SCHEME_V->dump_size += STACK_GROWTH;
3064	SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);	3051	SCHEME_V->dump_base = realloc (SCHEME_V->dump_base, sizeof (struct dump_stack_frame) * SCHEME_V->dump_size);
3065	}	3052	}
3066		3053
…		…
3322	s_return (S_T);	3309	s_return (S_T);
3323	#endif	3310	#endif
3324	case OP_LOAD: /* load */	3311	case OP_LOAD: /* load */
3325	if (file_interactive (SCHEME_A))	3312	if (file_interactive (SCHEME_A))
3326	{	3313	{
3327	xwrstr ("Loading "); xwrstr (strvalue (car (args))); xwrstr ("\n");	3314	putstr (SCHEME_A_ "Loading "); putstr (SCHEME_A_ strvalue (car (args))); putstr (SCHEME_A_ "\n");
3328	//D fprintf (SCHEME_V->outport->object.port->rep.stdio.file, "Loading %s\n", strvalue (car (args)));	3315	//D fprintf (port (SCHEME_V->outport)->rep.stdio.file, "Loading %s\n", strvalue (car (args)));
3329	}	3316	}
3330		3317
3331	if (!file_push (SCHEME_A_ strvalue (car (args))))	3318	if (!file_push (SCHEME_A_ strvalue (car (args))))
3332	Error_1 ("unable to open", car (args));	3319	Error_1 ("unable to open", car (args));
3333	else	3320	else
…		…
3337	}	3324	}
3338		3325
3339	case OP_T0LVL: /* top level */	3326	case OP_T0LVL: /* top level */
3340		3327
3341	/* If we reached the end of file, this loop is done. */	3328	/* If we reached the end of file, this loop is done. */
3342	if (SCHEME_V->loadport->object.port->kind & port_saw_EOF)	3329	if (port (SCHEME_V->loadport)->kind & port_saw_EOF)
3343	{	3330	{
3344	if (SCHEME_V->file_i == 0)	3331	if (SCHEME_V->file_i == 0)
3345	{	3332	{
3346	SCHEME_V->args = NIL;	3333	SCHEME_V->args = NIL;
3347	s_goto (OP_QUIT);	3334	s_goto (OP_QUIT);
…		…
3425	#endif	3412	#endif
3426	if (is_symbol (SCHEME_V->code)) /* symbol */	3413	if (is_symbol (SCHEME_V->code)) /* symbol */
3427	{	3414	{
3428	x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);	3415	x = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->code, 1);
3429		3416
3430	if (x != NIL)	3417	if (x == NIL)
3431	s_return (slot_value_in_env (x));
3432	else
3433	Error_1 ("eval: unbound variable:", SCHEME_V->code);	3418	Error_1 ("eval: unbound variable:", SCHEME_V->code);
		3419
		3420	s_return (slot_value_in_env (x));
3434	}	3421	}
3435	else if (is_pair (SCHEME_V->code))	3422	else if (is_pair (SCHEME_V->code))
3436	{	3423	{
3437	x = car (SCHEME_V->code);	3424	x = car (SCHEME_V->code);
3438		3425
…		…
3515	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */	3502	s_goto (procnum (SCHEME_V->code)); /* PROCEDURE */
3516	else if (is_foreign (SCHEME_V->code))	3503	else if (is_foreign (SCHEME_V->code))
3517	{	3504	{
3518	/* Keep nested calls from GC'ing the arglist */	3505	/* Keep nested calls from GC'ing the arglist */
3519	push_recent_alloc (SCHEME_A_ args, NIL);	3506	push_recent_alloc (SCHEME_A_ args, NIL);
3520	x = SCHEME_V->code->object.ff (SCHEME_A_ args);	3507	x = CELL(SCHEME_V->code)->object.ff (SCHEME_A_ args);
3521		3508
3522	s_return (x);	3509	s_return (x);
3523	}	3510	}
3524	else if (is_closure (SCHEME_V->code) \|\| is_macro (SCHEME_V->code) \|\| is_promise (SCHEME_V->code)) /* CLOSURE */	3511	else if (is_closure (SCHEME_V->code) \|\| is_macro (SCHEME_V->code) \|\| is_promise (SCHEME_V->code)) /* CLOSURE */
3525	{	3512	{
…		…
3562		3549
3563	case OP_DOMACRO: /* do macro */	3550	case OP_DOMACRO: /* do macro */
3564	SCHEME_V->code = SCHEME_V->value;	3551	SCHEME_V->code = SCHEME_V->value;
3565	s_goto (OP_EVAL);	3552	s_goto (OP_EVAL);
3566		3553
3567	#if 1
3568
3569	case OP_LAMBDA: /* lambda */	3554	case OP_LAMBDA: /* lambda */
3570	/* If the hook is defined, apply it to SCHEME_V->code, otherwise	3555	/* If the hook is defined, apply it to SCHEME_V->code, otherwise
3571	set SCHEME_V->value fall thru */	3556	set SCHEME_V->value fall thru */
3572	{	3557	{
3573	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);	3558	pointer f = find_slot_in_env (SCHEME_A_ SCHEME_V->envir, SCHEME_V->COMPILE_HOOK, 1);
…		…
3579	SCHEME_V->code = slot_value_in_env (f);	3564	SCHEME_V->code = slot_value_in_env (f);
3580	s_goto (OP_APPLY);	3565	s_goto (OP_APPLY);
3581	}	3566	}
3582		3567
3583	SCHEME_V->value = SCHEME_V->code;	3568	SCHEME_V->value = SCHEME_V->code;
3584	/* Fallthru */
3585	}	3569	}
		3570	/* Fallthru */
3586		3571
3587	case OP_LAMBDA1:	3572	case OP_LAMBDA1:
3588	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));	3573	s_return (mk_closure (SCHEME_A_ SCHEME_V->value, SCHEME_V->envir));
3589
3590	#else
3591
3592	case OP_LAMBDA: /* lambda */
3593	s_return (mk_closure (SCHEME_A_ SCHEME_V->code, SCHEME_V->envir));
3594
3595	#endif
3596		3574
3597	case OP_MKCLOSURE: /* make-closure */	3575	case OP_MKCLOSURE: /* make-closure */
3598	x = car (args);	3576	x = car (args);
3599		3577
3600	if (car (x) == SCHEME_V->LAMBDA)	3578	if (car (x) == SCHEME_V->LAMBDA)
…		…
4021		3999
4022	switch (op)	4000	switch (op)
4023	{	4001	{
4024	#if USE_MATH	4002	#if USE_MATH
4025	case OP_INEX2EX: /* inexact->exact */	4003	case OP_INEX2EX: /* inexact->exact */
4026	{
4027	if (is_integer (x))	4004	if (!is_integer (x))
4028	s_return (x);	4005	{
4029
4030	RVALUE r = rvalue_unchecked (x);	4006	RVALUE r = rvalue_unchecked (x);
4031		4007
4032	if (r == (RVALUE)(IVALUE)r)	4008	if (r == (RVALUE)(IVALUE)r)
4033	s_return (mk_integer (SCHEME_A_ rvalue_unchecked (x)));	4009	x = mk_integer (SCHEME_A_ rvalue_unchecked (x));
4034	else	4010	else
4035	Error_1 ("inexact->exact: not integral:", x);	4011	Error_1 ("inexact->exact: not integral:", x);
4036	}	4012	}
		4013
		4014	s_return (x);
4037		4015
4038	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));	4016	case OP_EXP: s_return (mk_real (SCHEME_A_ exp (rvalue (x))));
4039	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))));	4017	case OP_LOG: s_return (mk_real (SCHEME_A_ log (rvalue (x))
		4018	/ (cadr (args) == NIL ? 1 : log (rvalue (cadr (args))))));
4040	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));	4019	case OP_SIN: s_return (mk_real (SCHEME_A_ sin (rvalue (x))));
4041	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));	4020	case OP_COS: s_return (mk_real (SCHEME_A_ cos (rvalue (x))));
4042	case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));	4021	case OP_TAN: s_return (mk_real (SCHEME_A_ tan (rvalue (x))));
4043	case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));	4022	case OP_ASIN: s_return (mk_real (SCHEME_A_ asin (rvalue (x))));
4044	case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));	4023	case OP_ACOS: s_return (mk_real (SCHEME_A_ acos (rvalue (x))));
4045		4024
4046	case OP_ATAN:	4025	case OP_ATAN:
		4026	s_return (mk_real (SCHEME_A_
4047	if (cdr (args) == NIL)	4027	cdr (args) == NIL
4048	s_return (mk_real (SCHEME_A_ atan (rvalue (x))));	4028	? atan (rvalue (x))
4049	else	4029	: atan2 (rvalue (x), rvalue (cadr (args)))));
4050	{
4051	pointer y = cadr (args);
4052	s_return (mk_real (SCHEME_A_ atan2 (rvalue (x), rvalue (y))));
4053	}
4054		4030
4055	case OP_SQRT:	4031	case OP_SQRT:
4056	s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));	4032	s_return (mk_real (SCHEME_A_ sqrt (rvalue (x))));
4057		4033
4058	case OP_EXPT:	4034	case OP_EXPT:
…		…
4085	s_return (mk_real (SCHEME_A_ result));	4061	s_return (mk_real (SCHEME_A_ result));
4086	else	4062	else
4087	s_return (mk_integer (SCHEME_A_ result));	4063	s_return (mk_integer (SCHEME_A_ result));
4088	}	4064	}
4089		4065
4090	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));	4066	case OP_FLOOR: s_return (mk_real (SCHEME_A_ floor (rvalue (x))));
4091	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));	4067	case OP_CEILING: s_return (mk_real (SCHEME_A_ ceil (rvalue (x))));
4092
4093	case OP_TRUNCATE:
4094	{
4095	RVALUE n = rvalue (x);
4096	s_return (mk_real (SCHEME_A_ n > 0 ? floor (n) : ceil (n)));
4097	}
4098
4099	case OP_ROUND:
4100	if (is_integer (x))
4101	s_return (x);
4102
4103	s_return (mk_real (SCHEME_A_ round_per_R5RS (rvalue (x))));	4068	case OP_TRUNCATE: s_return (mk_real (SCHEME_A_ trunc (rvalue (x))));
		4069	case OP_ROUND: s_return (mk_real (SCHEME_A_ nearbyint (rvalue (x))));
4104	#endif	4070	#endif
4105		4071
4106	case OP_ADD: /* + */	4072	case OP_ADD: /* + */
4107	v = num_zero;	4073	v = num_zero;
4108		4074
…		…
4196	else	4162	else
4197	Error_0 ("modulo: division by zero");	4163	Error_0 ("modulo: division by zero");
4198		4164
4199	s_return (mk_number (SCHEME_A_ v));	4165	s_return (mk_number (SCHEME_A_ v));
4200		4166
4201	case OP_CAR: /* car */	4167	/* the compiler will optimize this mess... */
4202	s_return (caar (args));	4168	case OP_CAR: op_car: s_return (car (x));
4203		4169	case OP_CDR: op_cdr: s_return (cdr (x));
4204	case OP_CDR: /* cdr */	4170	case OP_CAAR: op_caar: x = car (x); goto op_car;
4205	s_return (cdar (args));	4171	case OP_CADR: op_cadr: x = cdr (x); goto op_car;
		4172	case OP_CDAR: op_cdar: x = car (x); goto op_cdr;
		4173	case OP_CDDR: op_cddr: x = cdr (x); goto op_cdr;
		4174	case OP_CAAAR: op_caaar: x = car (x); goto op_caar;
		4175	case OP_CAADR: op_caadr: x = cdr (x); goto op_caar;
		4176	case OP_CADAR: op_cadar: x = car (x); goto op_cadr;
		4177	case OP_CADDR: op_caddr: x = cdr (x); goto op_cadr;
		4178	case OP_CDAAR: op_cdaar: x = car (x); goto op_cdar;
		4179	case OP_CDADR: op_cdadr: x = cdr (x); goto op_cdar;
		4180	case OP_CDDAR: op_cddar: x = car (x); goto op_cddr;
		4181	case OP_CDDDR: op_cdddr: x = cdr (x); goto op_cddr;
		4182	case OP_CAAAAR: x = car (x); goto op_caaar;
		4183	case OP_CAAADR: x = cdr (x); goto op_caaar;
		4184	case OP_CAADAR: x = car (x); goto op_caadr;
		4185	case OP_CAADDR: x = cdr (x); goto op_caadr;
		4186	case OP_CADAAR: x = car (x); goto op_cadar;
		4187	case OP_CADADR: x = cdr (x); goto op_cadar;
		4188	case OP_CADDAR: x = car (x); goto op_caddr;
		4189	case OP_CADDDR: x = cdr (x); goto op_caddr;
		4190	case OP_CDAAAR: x = car (x); goto op_cdaar;
		4191	case OP_CDAADR: x = cdr (x); goto op_cdaar;
		4192	case OP_CDADAR: x = car (x); goto op_cdadr;
		4193	case OP_CDADDR: x = cdr (x); goto op_cdadr;
		4194	case OP_CDDAAR: x = car (x); goto op_cddar;
		4195	case OP_CDDADR: x = cdr (x); goto op_cddar;
		4196	case OP_CDDDAR: x = car (x); goto op_cdddr;
		4197	case OP_CDDDDR: x = cdr (x); goto op_cdddr;
4206		4198
4207	case OP_CONS: /* cons */	4199	case OP_CONS: /* cons */
4208	set_cdr (args, cadr (args));	4200	set_cdr (args, cadr (args));
4209	s_return (args);	4201	s_return (args);
4210		4202
…		…
4602	}	4594	}
4603	else	4595	else
4604	s_return (SCHEME_V->code);	4596	s_return (SCHEME_V->code);
4605		4597
4606	case OP_SAVE_FORCED: /* Save forced value replacing promise */	4598	case OP_SAVE_FORCED: /* Save forced value replacing promise */
4607	memcpy (SCHEME_V->code, SCHEME_V->value, sizeof (struct cell));	4599	CELL (SCHEME_V->code) = CELL (SCHEME_V->value);
4608	s_return (SCHEME_V->value);	4600	s_return (SCHEME_V->value);
4609		4601
4610	#if USE_PORTS	4602	#if USE_PORTS
4611		4603
4612	case OP_WRITE: /* write */	4604	case OP_WRITE: /* write */
…		…
4757	SCHEME_V->gc_verbose = (a != S_F);	4749	SCHEME_V->gc_verbose = (a != S_F);
4758	s_retbool (was);	4750	s_retbool (was);
4759	}	4751	}
4760		4752
4761	case OP_NEWSEGMENT: /* new-segment */	4753	case OP_NEWSEGMENT: /* new-segment */
		4754	#if 0
4762	if (!is_pair (args) \|\| !is_number (a))	4755	if (!is_pair (args) \|\| !is_number (a))
4763	Error_0 ("new-segment: argument must be a number");	4756	Error_0 ("new-segment: argument must be a number");
4764		4757	#endif
4765	alloc_cellseg (SCHEME_A_ ivalue (a));	4758	s_retbool (alloc_cellseg (SCHEME_A));
4766
4767	s_return (S_T);
4768		4759
4769	case OP_OBLIST: /* oblist */	4760	case OP_OBLIST: /* oblist */
4770	s_return (oblist_all_symbols (SCHEME_A));	4761	s_return (oblist_all_symbols (SCHEME_A));
4771		4762
4772	#if USE_PORTS	4763	#if USE_PORTS
…		…
4842	s_return (p == NIL ? S_F : p);	4833	s_return (p == NIL ? S_F : p);
4843	}	4834	}
4844		4835
4845	case OP_GET_OUTSTRING: /* get-output-string */	4836	case OP_GET_OUTSTRING: /* get-output-string */
4846	{	4837	{
4847	port *p;	4838	port *p = port (a);
4848		4839
4849	if ((p = a->object.port)->kind & port_string)	4840	if (p->kind & port_string)
4850	{	4841	{
4851	off_t size;	4842	off_t size;
4852	char *str;	4843	char *str;
4853		4844
4854	size = p->rep.string.curr - p->rep.string.start + 1;	4845	size = p->rep.string.curr - p->rep.string.start + 1;
…		…
4959	int res;	4950	int res;
4960		4951
4961	if (is_pair (args))	4952	if (is_pair (args))
4962	p = car (args);	4953	p = car (args);
4963		4954
4964	res = p->object.port->kind & port_string;	4955	res = port (p)->kind & port_string;
4965		4956
4966	s_retbool (res);	4957	s_retbool (res);
4967	}	4958	}
4968		4959
4969	case OP_SET_INPORT: /* set-input-port */	4960	case OP_SET_INPORT: /* set-input-port */
…		…
5509	if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))	5500	if (ecb_expect_false (dispatch_funcs [pcd->func] (SCHEME_A_ SCHEME_V->op) != 0))
5510	return;	5501	return;
5511		5502
5512	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)	5503	if (SCHEME_V->no_memory && USE_ERROR_CHECKING)
5513	{	5504	{
5514	xwrstr ("No memory!\n");	5505	putstr (SCHEME_A_ "No memory!\n");
5515	return;	5506	return;
5516	}	5507	}
5517	}	5508	}
5518	}	5509	}
5519		5510
…		…
5632	ecb_cold int	5623	ecb_cold int
5633	scheme_init (SCHEME_P)	5624	scheme_init (SCHEME_P)
5634	{	5625	{
5635	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);	5626	int i, n = sizeof (dispatch_table) / sizeof (dispatch_table[0]);
5636	pointer x;	5627	pointer x;
		5628
		5629	/* this memset is not strictly correct, as we assume (intcache)
		5630	* that memset 0 will also set pointers to 0, but memset does
		5631	* of course not guarantee that. screw such systems.
		5632	*/
		5633	memset (SCHEME_V, 0, sizeof (*SCHEME_V));
5637		5634
5638	num_set_fixnum (num_zero, 1);	5635	num_set_fixnum (num_zero, 1);
5639	num_set_ivalue (num_zero, 0);	5636	num_set_ivalue (num_zero, 0);
5640	num_set_fixnum (num_one, 1);	5637	num_set_fixnum (num_one, 1);
5641	num_set_ivalue (num_one, 1);	5638	num_set_ivalue (num_one, 1);
…		…
5653	SCHEME_V->save_inport = NIL;	5650	SCHEME_V->save_inport = NIL;
5654	SCHEME_V->loadport = NIL;	5651	SCHEME_V->loadport = NIL;
5655	SCHEME_V->nesting = 0;	5652	SCHEME_V->nesting = 0;
5656	SCHEME_V->interactive_repl = 0;	5653	SCHEME_V->interactive_repl = 0;
5657		5654
5658	if (alloc_cellseg (SCHEME_A_ FIRST_CELLSEGS) != FIRST_CELLSEGS)	5655	if (!alloc_cellseg (SCHEME_A))
5659	{	5656	{
5660	#if USE_ERROR_CHECKING	5657	#if USE_ERROR_CHECKING
5661	SCHEME_V->no_memory = 1;	5658	SCHEME_V->no_memory = 1;
5662	return 0;	5659	return 0;
5663	#endif	5660	#endif
…		…
5997	int isfile = 1;	5994	int isfile = 1;
5998	system ("ps v $PPID");//D	5995	system ("ps v $PPID");//D
5999		5996
6000	if (argc == 2 && strcmp (argv[1], "-?") == 0)	5997	if (argc == 2 && strcmp (argv[1], "-?") == 0)
6001	{	5998	{
6002	xwrstr ("Usage: tinyscheme -?\n");	5999	putstr (SCHEME_A_ "Usage: tinyscheme -?\n");
6003	xwrstr ("or: tinyscheme [<file1> <file2> ...]\n");	6000	putstr (SCHEME_A_ "or: tinyscheme [<file1> <file2> ...]\n");
6004	xwrstr ("followed by\n");	6001	putstr (SCHEME_A_ "followed by\n");
6005	xwrstr (" -1 <file> [<arg1> <arg2> ...]\n");	6002	putstr (SCHEME_A_ " -1 <file> [<arg1> <arg2> ...]\n");
6006	xwrstr (" -c <Scheme commands> [<arg1> <arg2> ...]\n");	6003	putstr (SCHEME_A_ " -c <Scheme commands> [<arg1> <arg2> ...]\n");
6007	xwrstr ("assuming that the executable is named tinyscheme.\n");	6004	putstr (SCHEME_A_ "assuming that the executable is named tinyscheme.\n");
6008	xwrstr ("Use - as filename for stdin.\n");	6005	putstr (SCHEME_A_ "Use - as filename for stdin.\n");
6009	return 1;	6006	return 1;
6010	}	6007	}
6011		6008
6012	if (!scheme_init (SCHEME_A))	6009	if (!scheme_init (SCHEME_A))
6013	{	6010	{
6014	xwrstr ("Could not initialize!\n");	6011	putstr (SCHEME_A_ "Could not initialize!\n");
6015	return 2;	6012	return 2;
6016	}	6013	}
6017		6014
6018	# if USE_PORTS	6015	# if USE_PORTS
6019	scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);	6016	scheme_set_input_port_file (SCHEME_A_ STDIN_FILENO);
…		…
6064	fin = open (file_name, O_RDONLY);	6061	fin = open (file_name, O_RDONLY);
6065	#endif	6062	#endif
6066		6063
6067	if (isfile && fin < 0)	6064	if (isfile && fin < 0)
6068	{	6065	{
6069	xwrstr ("Could not open file "); xwrstr (file_name); xwrstr ("\n");	6066	putstr (SCHEME_A_ "Could not open file "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6070	}	6067	}
6071	else	6068	else
6072	{	6069	{
6073	if (isfile)	6070	if (isfile)
6074	scheme_load_named_file (SCHEME_A_ fin, file_name);	6071	scheme_load_named_file (SCHEME_A_ fin, file_name);
…		…
6078	#if USE_PORTS	6075	#if USE_PORTS
6079	if (!isfile \|\| fin != STDIN_FILENO)	6076	if (!isfile \|\| fin != STDIN_FILENO)
6080	{	6077	{
6081	if (SCHEME_V->retcode != 0)	6078	if (SCHEME_V->retcode != 0)
6082	{	6079	{
6083	xwrstr ("Errors encountered reading "); xwrstr (file_name); xwrstr ("\n");	6080	putstr (SCHEME_A_ "Errors encountered reading "); putstr (SCHEME_A_ file_name); putstr (SCHEME_A_ "\n");
6084	}	6081	}
6085		6082
6086	if (isfile)	6083	if (isfile)
6087	close (fin);	6084	close (fin);
6088	}	6085	}

Diff Legend

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

Comparing cvsroot/microscheme/scheme.c (file contents): Revision 1.44 by root, Mon Nov 30 06:49:11 2015 UTC vs. Revision 1.55 by root, Tue Dec 1 03:03:11 2015 UTC

Diff Legend

Comparing cvsroot/microscheme/scheme.c (file contents):
Revision 1.44 by root, Mon Nov 30 06:49:11 2015 UTC vs.
Revision 1.55 by root, Tue Dec 1 03:03:11 2015 UTC