diff --git a/i.c b/i.c index 78f65b8..0a2406a 100644 --- a/i.c +++ b/i.c @@ -9,6 +9,9 @@ extern obj cx__2Atransformers_2A; extern obj cx__2Adynamic_2Dstate_2A; extern obj cx_continuation_2Dadapter_2Dcode; extern obj cx_callmv_2Dadapter_2Dclosure; +extern obj cx__2Acurrent_2Dinput_2A; +extern obj cx__2Acurrent_2Doutput_2A; +extern obj cx__2Acurrent_2Derror_2A; #define istagged(o, t) istagged_inlined(o, t) @@ -3080,18 +3083,70 @@ define_instruction(opp) { gonexti(); } +define_instruction(cin) { + ac = cx__2Acurrent_2Dinput_2A; + assert(is_iport(ac)); + gonexti(); +} + +define_instruction(cout) { + ac = cx__2Acurrent_2Doutput_2A; + assert(is_oport(ac)); + gonexti(); +} + +define_instruction(cerr) { + ac = cx__2Acurrent_2Derror_2A; + assert(is_oport(ac)); + gonexti(); +} + +define_instruction(cinv) { + if (ac == void_obj()) { + ac = cx__2Acurrent_2Dinput_2A; + assert(is_iport(ac)); + } else { + ckr(ac); + cx__2Acurrent_2Dinput_2A = ac; + } + gonexti(); +} + +define_instruction(coutv) { + if (ac == void_obj()) { + ac = cx__2Acurrent_2Doutput_2A; + assert(is_oport(ac)); + } else { + ckw(ac); + cx__2Acurrent_2Doutput_2A = ac; + } + gonexti(); +} + +define_instruction(cerrv) { + if (ac == void_obj()) { + ac = cx__2Acurrent_2Derror_2A; + assert(is_oport(ac)); + } else { + ckw(ac); + cx__2Acurrent_2Derror_2A = ac; + } + gonexti(); +} + + define_instruction(sip) { - ac = iport_file_obj(stdin); /* TODO: keep in global var -- in r7rs it is a parameter */ + ac = iport_file_obj(stdin); gonexti(); } define_instruction(sop) { - ac = oport_file_obj(stdout); /* TODO: keep in global var -- in r7rs it is a parameter */ + ac = oport_file_obj(stdout); gonexti(); } define_instruction(sep) { - ac = oport_file_obj(stderr); /* TODO: keep in global var -- in r7rs it is a parameter */ + ac = oport_file_obj(stderr); gonexti(); } @@ -4616,6 +4671,11 @@ static obj *init_module(obj *r, obj *sp, obj *hp, const char **mod) /* partially hand-coded module (prototyped in i.scm) */ char *i_code[] = { + /* initialize current port variables */ + "C", 0, + "P10Pi!" "P11Po!" "P12Pe!", + + /* internal continuation switch code */ "P", "%dynamic-state-reroot!", "%1.0,,#0.0,&1{%1.0,yq~?{${.2d,:0^[01}.0ad,.1aa,y,.1,.3c,.1sa.3,.1sdf,." "4san,.4sd.3sy_1.0[30}]1}.!0.0^_1[11", diff --git a/i.h b/i.h index a7dbfb2..b632fee 100644 --- a/i.h +++ b/i.h @@ -467,12 +467,18 @@ declare_instruction(boolp, "Y1", 0, "boolean?", declare_instruction(boxp, "Y2", 0, "box?", '1', AUTOGL) declare_instruction(voidp, "Y8", 0, "void?", '1', AUTOGL) declare_instruction(void, "Y9", 0, "void", '0', AUTOGL) +declare_instruction(cin, "Pi", 0, "%current-input-port", '0', AUTOGL) +declare_instruction(cout, "Po", 0, "%current-output-port", '0', AUTOGL) +declare_instruction(cerr, "Pe", 0, "%current-error-port", '0', AUTOGL) +declare_instruction(cinv, "Pi!\0Y9", 0, "current-input-port", 'u', AUTOGL) +declare_instruction(coutv, "Po!\0Y9", 0, "current-output-port", 'u', AUTOGL) +declare_instruction(cerrv, "Pe!\0Y9", 0, "current-error-port", 'u', AUTOGL) declare_instruction(funp, "K0", 0, "procedure?", '1', AUTOGL) declare_instruction(ipp, "P00", 0, "input-port?", '1', AUTOGL) declare_instruction(opp, "P01", 0, "output-port?", '1', AUTOGL) -declare_instruction(sip, "P10", 0, "current-input-port", '0', AUTOGL) -declare_instruction(sop, "P11", 0, "current-output-port", '0', AUTOGL) -declare_instruction(sep, "P12", 0, "current-error-port", '0', AUTOGL) +declare_instruction(sip, "P10", 0, "standard-input-port", '0', AUTOGL) +declare_instruction(sop, "P11", 0, "standard-output-port", '0', AUTOGL) +declare_instruction(sep, "P12", 0, "standard-error-port", '0', AUTOGL) declare_instruction(ipop, "P20", 0, "input-port-open?", '1', AUTOGL) declare_instruction(opop, "P21", 0, "output-port-open?", '1', AUTOGL) declare_instruction(oif, "P40", 0, "%open-input-file", '1', AUTOGL) @@ -488,23 +494,23 @@ declare_instruction(cop, "P61", 0, "close-output-port", declare_instruction(fop, "P71", 0, "flush-output-port", '1', AUTOGL) declare_instruction(gos, "P90", 0, "get-output-string", '1', AUTOGL) declare_instruction(gob, "P91", 0, "get-output-bytevector", '1', AUTOGL) -declare_instruction(rdc, "R0\0P10", 0, "read-char", 'u', AUTOGL) -declare_instruction(rdac, "R1\0P10", 0, "peek-char", 'u', AUTOGL) -declare_instruction(rdcr, "R2\0P10", 0, "char-ready?", 'u', AUTOGL) -declare_instruction(rd8, "R3\0P10", 0, "read-u8", 'u', AUTOGL) -declare_instruction(rda8, "R4\0P10", 0, "peek-u8", 'u', AUTOGL) -declare_instruction(rd8r, "R5\0P10", 0, "u8-ready?", 'u', AUTOGL) +declare_instruction(rdc, "R0\0Pi", 0, "read-char", 'u', AUTOGL) +declare_instruction(rdac, "R1\0Pi", 0, "peek-char", 'u', AUTOGL) +declare_instruction(rdcr, "R2\0Pi", 0, "char-ready?", 'u', AUTOGL) +declare_instruction(rd8, "R3\0Pi", 0, "read-u8", 'u', AUTOGL) +declare_instruction(rda8, "R4\0Pi", 0, "peek-u8", 'u', AUTOGL) +declare_instruction(rd8r, "R5\0Pi", 0, "u8-ready?", 'u', AUTOGL) declare_instruction(eofp, "R8", 0, "eof-object?", '1', AUTOGL) declare_instruction(eof, "R9", 0, "eof-object", '0', AUTOGL) -declare_instruction(wrc, "W0\0P11", 0, "write-char", 'b', AUTOGL) +declare_instruction(wrc, "W0\0Po", 0, "write-char", 'b', AUTOGL) declare_instruction(wrs, "W1", 0, "%write-string1", '2', AUTOGL) -declare_instruction(wr8, "W2\0P11", 0, "write-u8", 'b', AUTOGL) +declare_instruction(wr8, "W2\0Po", 0, "write-u8", 'b', AUTOGL) declare_instruction(wrb, "W3", 0, "%write-bytevector1", '2', AUTOGL) -declare_instruction(wrcd, "W4\0P11", 0, "display", 'b', AUTOGL) -declare_instruction(wrcw, "W5\0P11", 0, "write", 'b', AUTOGL) -declare_instruction(wrnl, "W6\0P11", 0, "newline", 'u', AUTOGL) -declare_instruction(wrhw, "W7\0P11", 0, "write-shared", 'b', AUTOGL) -declare_instruction(wriw, "W8\0P11", 0, "write-simple", 'b', AUTOGL) +declare_instruction(wrcd, "W4\0Po", 0, "display", 'b', AUTOGL) +declare_instruction(wrcw, "W5\0Po", 0, "write", 'b', AUTOGL) +declare_instruction(wrnl, "W6\0Po", 0, "newline", 'u', AUTOGL) +declare_instruction(wrhw, "W7\0Po", 0, "write-shared", 'b', AUTOGL) +declare_instruction(wriw, "W8\0Po", 0, "write-simple", 'b', AUTOGL) declare_instruction(fexis, "F0", 0, "file-exists?", '1', AUTOGL) declare_instruction(frem, "F1", 0, "delete-file", '1', AUTOGL) declare_instruction(fren, "F2", 0, "rename-file", '2', AUTOGL) diff --git a/k.c b/k.c index c4794f9..9fb27ea 100644 --- a/k.c +++ b/k.c @@ -451,6 +451,9 @@ obj cx__25residual_2Dfind_2Dtop_2Dbinding; /* %residual-find-top-binding */ obj cx__25residual_2Dmake_2Dbinding; /* %residual-make-binding */ obj cx__25residual_2Dval_2Dcore_3F; /* %residual-val-core? */ obj cx__25residual_2Dval_2Dspecial_3F; /* %residual-val-special? */ +obj cx__2Acurrent_2Derror_2A; /* *current-error* */ +obj cx__2Acurrent_2Dinput_2A; /* *current-input* */ +obj cx__2Acurrent_2Doutput_2A; /* *current-output* */ obj cx__2Adynamic_2Dstate_2A; /* *dynamic-state* */ obj cx__2Aglobals_2A; /* *globals* */ obj cx__2Ahide_2Drefs_2A; /* *hide-refs* */ @@ -581,57 +584,57 @@ static obj cx__231251; /* constant #1251 */ static obj cx__231315; /* constant #1315 */ static obj cx__231763; /* constant #1763 */ static obj cx__231823; /* constant #1823 */ -static obj cx__231903; /* constant #1903 */ -static obj cx__231948; /* constant #1948 */ -static obj cx__232041; /* constant #2041 */ -static obj cx__232062; /* constant #2062 */ -static obj cx__232409; /* constant #2409 */ -static obj cx__232716; /* constant #2716 */ -static obj cx__232881; /* constant #2881 */ -static obj cx__233019; /* constant #3019 */ -static obj cx__233024; /* constant #3024 */ -static obj cx__233028; /* constant #3028 */ -static obj cx__233052; /* constant #3052 */ -static obj cx__233053; /* constant #3053 */ -static obj cx__233062; /* constant #3062 */ -static obj cx__233063; /* constant #3063 */ -static obj cx__233074; /* constant #3074 */ -static obj cx__233097; /* constant #3097 */ -static obj cx__233166; /* constant #3166 */ -static obj cx__233170; /* constant #3170 */ -static obj cx__233292; /* constant #3292 */ -static obj cx__233334; /* constant #3334 */ +static obj cx__231906; /* constant #1906 */ +static obj cx__231951; /* constant #1951 */ +static obj cx__232044; /* constant #2044 */ +static obj cx__232065; /* constant #2065 */ +static obj cx__232412; /* constant #2412 */ +static obj cx__232719; /* constant #2719 */ +static obj cx__232884; /* constant #2884 */ +static obj cx__233022; /* constant #3022 */ +static obj cx__233027; /* constant #3027 */ +static obj cx__233031; /* constant #3031 */ +static obj cx__233055; /* constant #3055 */ +static obj cx__233056; /* constant #3056 */ +static obj cx__233065; /* constant #3065 */ +static obj cx__233066; /* constant #3066 */ +static obj cx__233077; /* constant #3077 */ +static obj cx__233100; /* constant #3100 */ +static obj cx__233169; /* constant #3169 */ +static obj cx__233173; /* constant #3173 */ +static obj cx__233295; /* constant #3295 */ +static obj cx__233337; /* constant #3337 */ static obj cx__23334; /* constant #334 */ -static obj cx__233342; /* constant #3342 */ -static obj cx__233343; /* constant #3343 */ -static obj cx__233344; /* constant #3344 */ static obj cx__233345; /* constant #3345 */ static obj cx__233346; /* constant #3346 */ -static obj cx__233369; /* constant #3369 */ -static obj cx__233373; /* constant #3373 */ -static obj cx__233643; /* constant #3643 */ -static obj cx__233845; /* constant #3845 */ +static obj cx__233347; /* constant #3347 */ +static obj cx__233348; /* constant #3348 */ +static obj cx__233349; /* constant #3349 */ +static obj cx__233372; /* constant #3372 */ +static obj cx__233376; /* constant #3376 */ +static obj cx__233646; /* constant #3646 */ +static obj cx__233848; /* constant #3848 */ static obj cx__23424; /* constant #424 */ -static obj cx__234247; /* constant #4247 */ -static obj cx__234377; /* constant #4377 */ +static obj cx__234250; /* constant #4250 */ +static obj cx__234380; /* constant #4380 */ static obj cx__23474; /* constant #474 */ -static obj cx__234785; /* constant #4785 */ -static obj cx__234809; /* constant #4809 */ -static obj cx__234810; /* constant #4810 */ +static obj cx__234788; /* constant #4788 */ +static obj cx__234812; /* constant #4812 */ +static obj cx__234813; /* constant #4813 */ static obj cx__23484; /* constant #484 */ -static obj cx__234866; /* constant #4866 */ -static obj cx__234873; /* constant #4873 */ -static obj cx__234880; /* constant #4880 */ -static obj cx__234882; /* constant #4882 */ -static obj cx__234938; /* constant #4938 */ -static obj cx__234969; /* constant #4969 */ -static obj cx__234974; /* constant #4974 */ -static obj cx__234975; /* constant #4975 */ -static obj cx__234993; /* constant #4993 */ +static obj cx__234869; /* constant #4869 */ +static obj cx__234876; /* constant #4876 */ +static obj cx__234883; /* constant #4883 */ +static obj cx__234885; /* constant #4885 */ +static obj cx__234941; /* constant #4941 */ +static obj cx__234972; /* constant #4972 */ +static obj cx__234977; /* constant #4977 */ +static obj cx__234978; /* constant #4978 */ static obj cx__234996; /* constant #4996 */ -static obj cx__235002; /* constant #5002 */ -static obj cx__235010; /* constant #5010 */ -static obj cx__235018; /* constant #5018 */ +static obj cx__234999; /* constant #4999 */ +static obj cx__235005; /* constant #5005 */ +static obj cx__235013; /* constant #5013 */ +static obj cx__235021; /* constant #5021 */ static obj cx__23509; /* constant #509 */ static obj cx__23517; /* constant #517 */ static obj cx__23527; /* constant #527 */ @@ -660,11 +663,11 @@ static obj cxs_set_2Dmember_3F(obj v2_x, obj v1_s) return obj_from_bool(1); } else { { /* let */ - obj v5442_tmp = (cdr((v1_s))); - obj v5441_tmp = (v2_x); + obj v5451_tmp = (cdr((v1_s))); + obj v5450_tmp = (v2_x); /* tail call */ - v2_x = (v5441_tmp); - v1_s = (v5442_tmp); + v2_x = (v5450_tmp); + v1_s = (v5451_tmp); goto s_set_2Dmember_3F; } } @@ -685,18 +688,18 @@ static obj cxs_syntax_2Dmatch_3F(obj v41_pat, obj v40_exp) } else { if ((ispair((v41_pat)))) { { /* let */ - obj v5435_tmp; + obj v5444_tmp; { /* let */ - obj v5439_tmp; + obj v5448_tmp; { /* let */ - obj v5440_tmp; + obj v5449_tmp; { static obj o = 0; static char s[] = { 36, 0 }; - v5440_tmp = (o ? o : (o = mksymbol(internsym(s)))); }; - v5439_tmp = obj_from_bool((car((v41_pat))) == (v5440_tmp)); + v5449_tmp = (o ? o : (o = mksymbol(internsym(s)))); }; + v5448_tmp = obj_from_bool((car((v41_pat))) == (v5449_tmp)); } - v5435_tmp = (bool_from_obj(v5439_tmp) ? ((ispair((cdr((v41_pat))))) ? obj_from_bool(isnull((cdr((cdr((v41_pat))))))) : obj_from_bool(0)) : obj_from_bool(0)); + v5444_tmp = (bool_from_obj(v5448_tmp) ? ((ispair((cdr((v41_pat))))) ? obj_from_bool(isnull((cdr((cdr((v41_pat))))))) : obj_from_bool(0)) : obj_from_bool(0)); } - if (bool_from_obj(v5435_tmp)) { + if (bool_from_obj(v5444_tmp)) { return obj_from_bool((v40_exp) == (car((cdr((v41_pat)))))); } else { if (bool_from_obj((ispair((cdr((v41_pat))))) ? (((car((cdr((v41_pat))))) == (mksymbol(internsym("...")))) ? obj_from_bool(isnull((cdr((cdr((v41_pat))))))) : obj_from_bool(0)) : obj_from_bool(0))) { @@ -714,9 +717,9 @@ static obj cxs_syntax_2Dmatch_3F(obj v41_pat, obj v40_exp) if ((ispair((v58_lst)))) { if (bool_from_obj(cxs_syntax_2Dmatch_3F((v56_pat), (car((v58_lst)))))) { { /* let */ - obj v5438_tmp = (cdr((v58_lst))); + obj v5447_tmp = (cdr((v58_lst))); /* tail call */ - v58_lst = (v5438_tmp); + v58_lst = (v5447_tmp); goto s_f; } } else { @@ -732,11 +735,11 @@ static obj cxs_syntax_2Dmatch_3F(obj v41_pat, obj v40_exp) if ((ispair((v40_exp)))) { if (bool_from_obj(cxs_syntax_2Dmatch_3F((car((v41_pat))), (car((v40_exp)))))) { { /* let */ - obj v5437_tmp = (cdr((v40_exp))); - obj v5436_tmp = (cdr((v41_pat))); + obj v5446_tmp = (cdr((v40_exp))); + obj v5445_tmp = (cdr((v41_pat))); /* tail call */ - v41_pat = (v5436_tmp); - v40_exp = (v5437_tmp); + v41_pat = (v5445_tmp); + v40_exp = (v5446_tmp); goto s_syntax_2Dmatch_3F; } } else { @@ -763,11 +766,11 @@ static obj cxs_posq(obj v117_x, obj v116_l) obj v120_l; obj v119_n; { /* let */ - obj v5434_tmp = obj_from_fixnum(+0); - obj v5433_tmp = (v116_l); + obj v5443_tmp = obj_from_fixnum(+0); + obj v5442_tmp = (v116_l); /* tail call */ - v120_l = (v5433_tmp); - v119_n = (v5434_tmp); + v120_l = (v5442_tmp); + v119_n = (v5443_tmp); goto s_loop; } s_loop: @@ -778,11 +781,11 @@ static obj cxs_posq(obj v117_x, obj v116_l) return (v119_n); } else { { /* let */ - obj v5432_tmp = obj_from_fixnum(fxadd(fixnum_from_obj(v119_n), (+1))); - obj v5431_tmp = (cdr((v120_l))); + obj v5441_tmp = obj_from_fixnum(fxadd(fixnum_from_obj(v119_n), (+1))); + obj v5440_tmp = (cdr((v120_l))); /* tail call */ - v120_l = (v5431_tmp); - v119_n = (v5432_tmp); + v120_l = (v5440_tmp); + v119_n = (v5441_tmp); goto s_loop; } } @@ -834,6 +837,9 @@ static obj cxs_den_2D_3Esym(obj v297_den) /* gc roots */ static obj *globv[] = { + &cx__2Acurrent_2Derror_2A, + &cx__2Acurrent_2Dinput_2A, + &cx__2Acurrent_2Doutput_2A, &cx__2Adynamic_2Dstate_2A, &cx__2Aglobals_2A, &cx__2Ahide_2Drefs_2A, @@ -876,57 +882,57 @@ static obj *globv[] = { &cx__231315, &cx__231763, &cx__231823, - &cx__231903, - &cx__231948, - &cx__232041, - &cx__232062, - &cx__232409, - &cx__232716, - &cx__232881, - &cx__233019, - &cx__233024, - &cx__233028, - &cx__233052, - &cx__233053, - &cx__233062, - &cx__233063, - &cx__233074, - &cx__233097, - &cx__233166, - &cx__233170, - &cx__233292, - &cx__233334, + &cx__231906, + &cx__231951, + &cx__232044, + &cx__232065, + &cx__232412, + &cx__232719, + &cx__232884, + &cx__233022, + &cx__233027, + &cx__233031, + &cx__233055, + &cx__233056, + &cx__233065, + &cx__233066, + &cx__233077, + &cx__233100, + &cx__233169, + &cx__233173, + &cx__233295, + &cx__233337, &cx__23334, - &cx__233342, - &cx__233343, - &cx__233344, &cx__233345, &cx__233346, - &cx__233369, - &cx__233373, - &cx__233643, - &cx__233845, + &cx__233347, + &cx__233348, + &cx__233349, + &cx__233372, + &cx__233376, + &cx__233646, + &cx__233848, &cx__23424, - &cx__234247, - &cx__234377, + &cx__234250, + &cx__234380, &cx__23474, - &cx__234785, - &cx__234809, - &cx__234810, + &cx__234788, + &cx__234812, + &cx__234813, &cx__23484, - &cx__234866, - &cx__234873, - &cx__234880, - &cx__234882, - &cx__234938, - &cx__234969, - &cx__234974, - &cx__234975, - &cx__234993, + &cx__234869, + &cx__234876, + &cx__234883, + &cx__234885, + &cx__234941, + &cx__234972, + &cx__234977, + &cx__234978, &cx__234996, - &cx__235002, - &cx__235010, - &cx__235018, + &cx__234999, + &cx__235005, + &cx__235013, + &cx__235021, &cx__23509, &cx__23517, &cx__23527, @@ -1309,11 +1315,11 @@ case 0: /* load module */ *--hp = r[1]; *--hp = obj_from_size(PAIR_BTAG); cx__231823 = (hendblk(3)); } - cx__231903 = (hpushstr(0, newstring("compiler: "))); - cx__231948 = (hpushstr(0, newstring("cannot encode literal"))); - cx__232041 = (hpushstr(0, newstring("0123456789"))); - cx__232062 = (hpushstr(0, newstring("misplaced define form"))); - cx__232409 = (hpushstr(0, newstring("unsupported integrable type"))); + cx__231906 = (hpushstr(0, newstring("compiler: "))); + cx__231951 = (hpushstr(0, newstring("cannot encode literal"))); + cx__232044 = (hpushstr(0, newstring("0123456789"))); + cx__232065 = (hpushstr(0, newstring("misplaced define form"))); + cx__232412 = (hpushstr(0, newstring("unsupported integrable type"))); { /* cons */ hreserve(hbsz(3), 0); /* 0 live regs */ *--hp = (mknull()); @@ -1331,33 +1337,33 @@ case 0: /* load module */ *--hp = r[0]; *--hp = (mksymbol(internsym("quote"))); *--hp = obj_from_size(PAIR_BTAG); - cx__232716 = (hendblk(3)); } + cx__232719 = (hendblk(3)); } { /* cons */ hreserve(hbsz(3), 0); /* 0 live regs */ *--hp = (mknull()); *--hp = (mksymbol(internsym("begin"))); *--hp = obj_from_size(PAIR_BTAG); - cx__232881 = (hendblk(3)); } + cx__232884 = (hendblk(3)); } { static char s[] = { 34, 10, 0 }; - cx__233019 = (hpushstr(0, newstring(s))); } + cx__233022 = (hpushstr(0, newstring(s))); } { static char s[] = { 32, 32, 34, 0 }; - cx__233024 = (hpushstr(0, newstring(s))); } + cx__233027 = (hpushstr(0, newstring(s))); } { static char s[] = { 34, 44, 0 }; - cx__233028 = (hpushstr(0, newstring(s))); } + cx__233031 = (hpushstr(0, newstring(s))); } { static char s[] = { 34, 44, 10, 0 }; - cx__233052 = (hpushstr(0, newstring(s))); } + cx__233055 = (hpushstr(0, newstring(s))); } { static char s[] = { 32, 32, 34, 83, 34, 44, 32, 34, 0 }; - cx__233053 = (hpushstr(0, newstring(s))); } + cx__233056 = (hpushstr(0, newstring(s))); } { static char s[] = { 32, 34, 0 }; - cx__233062 = (hpushstr(0, newstring(s))); } + cx__233065 = (hpushstr(0, newstring(s))); } { static char s[] = { 32, 32, 34, 65, 34, 44, 32, 34, 0 }; - cx__233063 = (hpushstr(0, newstring(s))); } + cx__233066 = (hpushstr(0, newstring(s))); } { static char s[] = { 32, 32, 34, 67, 34, 44, 32, 48, 44, 10, 0 }; - cx__233074 = (hpushstr(0, newstring(s))); } + cx__233077 = (hpushstr(0, newstring(s))); } { static char s[] = { 32, 32, 34, 80, 34, 44, 32, 34, 0 }; - cx__233097 = (hpushstr(0, newstring(s))); } - cx__233166 = (hpushstr(0, newstring("r"))); - cx__233170 = (hpushstr(0, newstring("cannot open input file"))); + cx__233100 = (hpushstr(0, newstring(s))); } + cx__233169 = (hpushstr(0, newstring("r"))); + cx__233173 = (hpushstr(0, newstring("cannot open input file"))); { /* cons */ hreserve(hbsz(3), 0); /* 0 live regs */ *--hp = (mknull()); @@ -1375,15 +1381,15 @@ case 0: /* load module */ *--hp = r[0]; *--hp = obj_from_char(92); *--hp = obj_from_size(PAIR_BTAG); - cx__233292 = (hendblk(3)); } + cx__233295 = (hendblk(3)); } { static char s[] = { 10, 32, 32, 48, 44, 32, 48, 44, 32, 48, 10, 125, 59, 10, 0 }; - cx__233334 = (hpushstr(0, newstring(s))); } - cx__233342 = (hpushstr(0, newstring("_code[] = {"))); - cx__233343 = (hpushstr(0, newstring("char *"))); - cx__233344 = (hpushstr(0, newstring(" */"))); - cx__233345 = (hpushstr(0, newstring(".c -- generated via skint -c "))); - cx__233346 = (hpushstr(0, newstring("/* "))); - cx__233369 = (hpushstr(0, newstring("K5"))); + cx__233337 = (hpushstr(0, newstring(s))); } + cx__233345 = (hpushstr(0, newstring("_code[] = {"))); + cx__233346 = (hpushstr(0, newstring("char *"))); + cx__233347 = (hpushstr(0, newstring(" */"))); + cx__233348 = (hpushstr(0, newstring(".c -- generated via skint -c "))); + cx__233349 = (hpushstr(0, newstring("/* "))); + cx__233372 = (hpushstr(0, newstring("K5"))); { /* cons */ hreserve(hbsz(3), 0); /* 0 live regs */ *--hp = (mknull()); @@ -2199,7 +2205,7 @@ case 0: /* load module */ *--hp = r[0]; *--hp = (mksymbol(internsym("let"))); *--hp = obj_from_size(PAIR_BTAG); - cx__233373 = (hendblk(3)); } + cx__233376 = (hendblk(3)); } { /* cons */ hreserve(hbsz(3), 0); /* 0 live regs */ *--hp = (mknull()); @@ -2799,7 +2805,7 @@ case 0: /* load module */ *--hp = r[0]; *--hp = (mksymbol(internsym("let"))); *--hp = obj_from_size(PAIR_BTAG); - cx__233643 = (hendblk(3)); } + cx__233646 = (hendblk(3)); } { /* cons */ hreserve(hbsz(3), 0); /* 0 live regs */ *--hp = (mknull()); @@ -3999,7 +4005,7 @@ case 0: /* load module */ *--hp = r[0]; *--hp = (mksymbol(internsym("let"))); *--hp = obj_from_size(PAIR_BTAG); - cx__233845 = (hendblk(3)); } + cx__233848 = (hendblk(3)); } { /* cons */ hreserve(hbsz(3), 0); /* 0 live regs */ *--hp = (mknull()); @@ -4383,7 +4389,7 @@ case 0: /* load module */ *--hp = r[0]; *--hp = (mksymbol(internsym("let"))); *--hp = obj_from_size(PAIR_BTAG); - cx__234247 = (hendblk(3)); } + cx__234250 = (hendblk(3)); } { /* cons */ hreserve(hbsz(3), 0); /* 0 live regs */ *--hp = (mknull()); @@ -5523,16 +5529,16 @@ case 0: /* load module */ *--hp = r[0]; *--hp = (mksymbol(internsym("let"))); *--hp = obj_from_size(PAIR_BTAG); - cx__234377 = (hendblk(3)); } - cx__234785 = (hpushstr(0, newstring(" ms."))); - cx__234809 = (hpushstr(0, newstring("Elapsed time: "))); - cx__234810 = (hpushstr(0, newstring("Running tests ..."))); - cx__234866 = (hpushstr(0, newstring("DECODE+EXECUTE =>"))); - cx__234873 = (hpushstr(0, newstring("COMPILE-TO-STRING =>"))); - cx__234880 = (hpushstr(0, newstring("unexpected transformed output"))); - cx__234882 = (hpushstr(0, newstring("TRANSFORM =>"))); + cx__234380 = (hendblk(3)); } + cx__234788 = (hpushstr(0, newstring(" ms."))); + cx__234812 = (hpushstr(0, newstring("Elapsed time: "))); + cx__234813 = (hpushstr(0, newstring("Running tests ..."))); + cx__234869 = (hpushstr(0, newstring("DECODE+EXECUTE =>"))); + cx__234876 = (hpushstr(0, newstring("COMPILE-TO-STRING =>"))); + cx__234883 = (hpushstr(0, newstring("unexpected transformed output"))); + cx__234885 = (hpushstr(0, newstring("TRANSFORM =>"))); { static char s[] = { 10, 115, 107, 105, 110, 116, 62, 32, 0 }; - cx__234938 = (hpushstr(0, newstring(s))); } + cx__234941 = (hpushstr(0, newstring(s))); } { /* cons */ hreserve(hbsz(3), 0); /* 0 live regs */ *--hp = (mknull()); @@ -5544,8 +5550,8 @@ case 0: /* load module */ *--hp = r[0]; *--hp = (mksymbol(internsym("main"))); *--hp = obj_from_size(PAIR_BTAG); - cx__234969 = (hendblk(3)); } - cx__234974 = (hpushstr(0, newstring("unexpected benchmark file format"))); + cx__234972 = (hendblk(3)); } + cx__234977 = (hpushstr(0, newstring("unexpected benchmark file format"))); r[0] = (hpushstr(0, newstring("libl.sf"))); { /* cons */ hreserve(hbsz(3), 1); /* 1 live regs */ @@ -5558,21 +5564,21 @@ case 0: /* load module */ *--hp = r[0]; *--hp = (mksymbol(internsym("load"))); *--hp = obj_from_size(PAIR_BTAG); - cx__234975 = (hendblk(3)); } + cx__234978 = (hendblk(3)); } r[0] = (hpushstr(0, newstring("-v"))); { /* cons */ hreserve(hbsz(3), 1); /* 1 live regs */ *--hp = (mknull()); *--hp = r[0]; *--hp = obj_from_size(PAIR_BTAG); - cx__234993 = (hendblk(3)); } + cx__234996 = (hendblk(3)); } r[0] = (hpushstr(0, newstring("-t"))); { /* cons */ hreserve(hbsz(3), 1); /* 1 live regs */ *--hp = (mknull()); *--hp = r[0]; *--hp = obj_from_size(PAIR_BTAG); - cx__234996 = (hendblk(3)); } + cx__234999 = (hendblk(3)); } { /* cons */ hreserve(hbsz(3), 0); /* 0 live regs */ *--hp = (mknull()); @@ -5585,7 +5591,7 @@ case 0: /* load module */ *--hp = r[0]; *--hp = r[1]; *--hp = obj_from_size(PAIR_BTAG); - cx__235002 = (hendblk(3)); } + cx__235005 = (hendblk(3)); } { /* cons */ hreserve(hbsz(3), 0); /* 0 live regs */ *--hp = (mknull()); @@ -5598,7 +5604,7 @@ case 0: /* load module */ *--hp = r[0]; *--hp = r[1]; *--hp = obj_from_size(PAIR_BTAG); - cx__235010 = (hendblk(3)); } + cx__235013 = (hendblk(3)); } { /* cons */ hreserve(hbsz(3), 0); /* 0 live regs */ *--hp = (mknull()); @@ -5611,7 +5617,7 @@ case 0: /* load module */ *--hp = r[0]; *--hp = r[1]; *--hp = obj_from_size(PAIR_BTAG); - cx__235018 = (hendblk(3)); } + cx__235021 = (hendblk(3)); } { static obj c[] = { obj_from_case(1) }; cx_set_2Dmember_3F = (obj)c; } { static obj c[] = { obj_from_case(2) }; cx_set_2Dcons = (obj)c; } { static obj c[] = { obj_from_case(3) }; cx_set_2Dunion = (obj)c; } @@ -6526,16 +6532,16 @@ gs_normalize_2Darity: /* k arity */ r[2+2] = r[1]; r += 2; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v13968; + goto s_loop_v13986; } -s_loop_v13968: /* k cnt l */ +s_loop_v13986: /* k cnt l */ if ((ispair((r[2])))) { r[3] = (cdr((r[2]))); /* r[0] */ r[1] = obj_from_fixnum(fxadd((+1), fixnum_from_obj(r[1]))); r[2] = r[3]; - goto s_loop_v13968; + goto s_loop_v13986; } else { if ((isnull((r[2])))) { { /* cons */ @@ -6593,10 +6599,10 @@ gs_flatten_2Didslist: /* k ilist */ r[2+2] = (mknull()); r += 2; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v13955; + goto s_loop_v13973; } -s_loop_v13955: /* k l r */ +s_loop_v13973: /* k l r */ if ((ispair((r[1])))) { r[3] = (cdr((r[1]))); r[4] = (car((r[1]))); @@ -6609,7 +6615,7 @@ s_loop_v13955: /* k l r */ /* r[0] */ r[1] = r[3]; r[2] = r[4]; - goto s_loop_v13955; + goto s_loop_v13973; } else { if ((isnull((r[1])))) { { /* reverse! */ @@ -7548,7 +7554,7 @@ s_conv: /* k sexp */ r[0] = r[4]; r[1] = r[3]; /* r[2] */ - goto s_loop_v13684; + goto s_loop_v13702; } else { r[3+0] = r[0]; pc = objptr_from_obj(r[3+0])[0]; @@ -7605,7 +7611,7 @@ case 65: /* clo ek r */ rc = 3; goto jump; -s_loop_v13684: /* k l conv */ +s_loop_v13702: /* k l conv */ if ((ispair((r[1])))) { r[3] = (cdr((r[1]))); hreserve(hbsz(3+1), 4); /* 4 live regs */ @@ -7617,7 +7623,7 @@ s_loop_v13684: /* k l conv */ r[0] = r[4]; r[1] = r[3]; /* r[2] */ - goto s_loop_v13684; + goto s_loop_v13702; } else { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -7677,13 +7683,13 @@ case 68: /* clo ek r */ r[1+2] = p[1]; } r += 1; /* shift reg. wnd */ /* ek r k */ - { fixnum_t v14238_tmp; + { fixnum_t v14256_tmp; { /* length */ int n; obj l = r[1]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14238_tmp = (n); } + v14256_tmp = (n); } { /* list->vector */ - obj l; int i, c = (v14238_tmp); + obj l; int i, c = (v14256_tmp); hreserve(hbsz(c+1), 3); /* 3 live regs */ l = r[1]; /* gc-safe */ for (i = 0; i < c; ++i, l = cdr(l)) hp[i-c] = car(l); @@ -7867,9 +7873,9 @@ gs_xform_2Dsyntax_2Derror: /* k tail env */ r[3] = (hendblk(2+1)); r[0] = r[3]; /* r[1] */ - goto s_loop_v13616; + goto s_loop_v13634; -s_loop_v13616: /* k l */ +s_loop_v13634: /* k l */ if ((ispair((r[1])))) { r[2] = (cdr((r[1]))); hreserve(hbsz(2+1), 3); /* 3 live regs */ @@ -7879,7 +7885,7 @@ s_loop_v13616: /* k l */ r[3] = (hendblk(2+1)); r[0] = r[3]; r[1] = r[2]; - goto s_loop_v13616; + goto s_loop_v13634; } else { r[2+0] = r[0]; pc = objptr_from_obj(r[2+0])[0]; @@ -8250,7 +8256,7 @@ gs_xform_2Dbegin: /* k tail env */ r[0] = r[3]; /* r[1] */ /* r[2] */ - goto s_loop_v13551; + goto s_loop_v13569; } else { { /* cons */ hreserve(hbsz(3), 3); /* 3 live regs */ @@ -8269,7 +8275,7 @@ gs_xform_2Dbegin: /* k tail env */ goto jump; } -s_loop_v13551: /* k l env */ +s_loop_v13569: /* k l env */ if ((ispair((r[1])))) { r[3] = (cdr((r[1]))); hreserve(hbsz(3+1), 4); /* 4 live regs */ @@ -8281,7 +8287,7 @@ s_loop_v13551: /* k l env */ r[0] = r[4]; r[1] = r[3]; /* r[2] */ - goto s_loop_v13551; + goto s_loop_v13569; } else { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -8379,7 +8385,7 @@ gs_xform_2Dif: /* k tail env */ r[0] = r[3]; /* r[1] */ /* r[2] */ - goto s_loop_v13520; + goto s_loop_v13538; } else { { /* cons */ hreserve(hbsz(3), 3); /* 3 live regs */ @@ -8398,7 +8404,7 @@ gs_xform_2Dif: /* k tail env */ goto jump; } -s_loop_v13520: /* k l env */ +s_loop_v13538: /* k l env */ if ((ispair((r[1])))) { r[3] = (cdr((r[1]))); hreserve(hbsz(3+1), 4); /* 4 live regs */ @@ -8410,7 +8416,7 @@ s_loop_v13520: /* k l env */ r[0] = r[4]; r[1] = r[3]; /* r[2] */ - goto s_loop_v13520; + goto s_loop_v13538; } else { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -8476,13 +8482,13 @@ case 90: /* clo ek r */ for (n = 0; l != mknull(); ++n, l = cdr(l)) ; r[4] = obj_from_fixnum(n); } if (((((r[4]) == obj_from_fixnum(+2)) && ((r[4]) == obj_from_fixnum(+2))) && (1))) { - { fixnum_t v14237_tmp; + { fixnum_t v14255_tmp; { /* length */ int n; obj l = r[1]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14237_tmp = (n); } + v14255_tmp = (n); } { /* append */ - obj t, l, o, *p, *d; int c = (v14237_tmp); + obj t, l, o, *p, *d; int c = (v14255_tmp); hreserve(hbsz(3)*c, 5); /* 5 live regs */ l = r[1]; t = (cx__23650); /* gc-safe */ o = t; p = &o; @@ -8553,7 +8559,7 @@ gs_xform_2Dcall: /* k xexp tail env */ r[0] = r[4]; r[1] = r[2]; r[2] = r[3]; - goto s_loop_v13487; + goto s_loop_v13505; } else { { /* cons */ hreserve(hbsz(3), 4); /* 4 live regs */ @@ -8572,7 +8578,7 @@ gs_xform_2Dcall: /* k xexp tail env */ goto jump; } -s_loop_v13487: /* k l env */ +s_loop_v13505: /* k l env */ if ((ispair((r[1])))) { r[3] = (cdr((r[1]))); hreserve(hbsz(3+1), 4); /* 4 live regs */ @@ -8584,7 +8590,7 @@ s_loop_v13487: /* k l env */ r[0] = r[4]; r[1] = r[3]; /* r[2] */ - goto s_loop_v13487; + goto s_loop_v13505; } else { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -8690,79 +8696,79 @@ gs_integrable_2Dargc_2Dmatch_3F: /* k igt n */ if ((is_fixnum_obj(r[2]))) { r[3] = obj_from_bool(fixnum_from_obj(r[2]) == (+0)); } else { - { const flonum_t v14236_tmp = ((flonum_t)(+0)); - r[3] = obj_from_bool(flonum_from_obj(r[2]) == (v14236_tmp)); } + { const flonum_t v14254_tmp = ((flonum_t)(+0)); + r[3] = obj_from_bool(flonum_from_obj(r[2]) == (v14254_tmp)); } } } else { if (((((r[1]) == obj_from_char('1')) || ((is_flonum_obj(r[1])) && (0))) && (1))) { if ((is_fixnum_obj(r[2]))) { r[3] = obj_from_bool(fixnum_from_obj(r[2]) == (+1)); } else { - { const flonum_t v14235_tmp = ((flonum_t)(+1)); - r[3] = obj_from_bool(flonum_from_obj(r[2]) == (v14235_tmp)); } + { const flonum_t v14253_tmp = ((flonum_t)(+1)); + r[3] = obj_from_bool(flonum_from_obj(r[2]) == (v14253_tmp)); } } } else { if (((((r[1]) == obj_from_char('2')) || ((is_flonum_obj(r[1])) && (0))) && (1))) { if ((is_fixnum_obj(r[2]))) { r[3] = obj_from_bool(fixnum_from_obj(r[2]) == (+2)); } else { - { const flonum_t v14234_tmp = ((flonum_t)(+2)); - r[3] = obj_from_bool(flonum_from_obj(r[2]) == (v14234_tmp)); } + { const flonum_t v14252_tmp = ((flonum_t)(+2)); + r[3] = obj_from_bool(flonum_from_obj(r[2]) == (v14252_tmp)); } } } else { if (((((r[1]) == obj_from_char('3')) || ((is_flonum_obj(r[1])) && (0))) && (1))) { if ((is_fixnum_obj(r[2]))) { r[3] = obj_from_bool(fixnum_from_obj(r[2]) == (+3)); } else { - { const flonum_t v14233_tmp = ((flonum_t)(+3)); - r[3] = obj_from_bool(flonum_from_obj(r[2]) == (v14233_tmp)); } + { const flonum_t v14251_tmp = ((flonum_t)(+3)); + r[3] = obj_from_bool(flonum_from_obj(r[2]) == (v14251_tmp)); } } } else { if (((((r[1]) == obj_from_char('p')) || ((is_flonum_obj(r[1])) && (0))) && (1))) { if ((is_fixnum_obj(r[2]))) { r[3] = obj_from_bool(fixnum_from_obj(r[2]) >= (+0)); } else { - { const flonum_t v14232_tmp = ((flonum_t)(+0)); - r[3] = obj_from_bool(flonum_from_obj(r[2]) >= (v14232_tmp)); } + { const flonum_t v14250_tmp = ((flonum_t)(+0)); + r[3] = obj_from_bool(flonum_from_obj(r[2]) >= (v14250_tmp)); } } } else { if (((((r[1]) == obj_from_char('m')) || ((is_flonum_obj(r[1])) && (0))) && (1))) { if ((is_fixnum_obj(r[2]))) { r[3] = obj_from_bool(fixnum_from_obj(r[2]) >= (+1)); } else { - { const flonum_t v14231_tmp = ((flonum_t)(+1)); - r[3] = obj_from_bool(flonum_from_obj(r[2]) >= (v14231_tmp)); } + { const flonum_t v14249_tmp = ((flonum_t)(+1)); + r[3] = obj_from_bool(flonum_from_obj(r[2]) >= (v14249_tmp)); } } } else { if (((((r[1]) == obj_from_char('c')) || ((is_flonum_obj(r[1])) && (0))) && (1))) { if ((is_fixnum_obj(r[2]))) { r[3] = obj_from_bool(fixnum_from_obj(r[2]) >= (+2)); } else { - { const flonum_t v14230_tmp = ((flonum_t)(+2)); - r[3] = obj_from_bool(flonum_from_obj(r[2]) >= (v14230_tmp)); } + { const flonum_t v14248_tmp = ((flonum_t)(+2)); + r[3] = obj_from_bool(flonum_from_obj(r[2]) >= (v14248_tmp)); } } } else { if (((((r[1]) == obj_from_char('x')) || ((is_flonum_obj(r[1])) && (0))) && (1))) { if ((is_fixnum_obj(r[2]))) { r[3] = obj_from_bool(fixnum_from_obj(r[2]) >= (+1)); } else { - { const flonum_t v14229_tmp = ((flonum_t)(+1)); - r[3] = obj_from_bool(flonum_from_obj(r[2]) >= (v14229_tmp)); } + { const flonum_t v14247_tmp = ((flonum_t)(+1)); + r[3] = obj_from_bool(flonum_from_obj(r[2]) >= (v14247_tmp)); } } } else { if (((((r[1]) == obj_from_char('u')) || ((is_flonum_obj(r[1])) && (0))) && (1))) { if ((is_fixnum_obj(r[2]))) { r[3] = obj_from_bool((+0) <= fixnum_from_obj(r[2])); } else { - { const flonum_t v14228_tmp = ((flonum_t)(+0)); - r[3] = obj_from_bool((v14228_tmp) <= flonum_from_obj(r[2])); } + { const flonum_t v14246_tmp = ((flonum_t)(+0)); + r[3] = obj_from_bool((v14246_tmp) <= flonum_from_obj(r[2])); } } if (bool_from_obj(r[3])) { if ((is_fixnum_obj(r[2]))) { r[3] = obj_from_bool(fixnum_from_obj(r[2]) <= (+1)); } else { - { const flonum_t v14227_tmp = ((flonum_t)(+1)); - r[3] = obj_from_bool(flonum_from_obj(r[2]) <= (v14227_tmp)); } + { const flonum_t v14245_tmp = ((flonum_t)(+1)); + r[3] = obj_from_bool(flonum_from_obj(r[2]) <= (v14245_tmp)); } } } else { r[3] = obj_from_bool(0); @@ -8772,15 +8778,15 @@ gs_integrable_2Dargc_2Dmatch_3F: /* k igt n */ if ((is_fixnum_obj(r[2]))) { r[3] = obj_from_bool((+1) <= fixnum_from_obj(r[2])); } else { - { const flonum_t v14226_tmp = ((flonum_t)(+1)); - r[3] = obj_from_bool((v14226_tmp) <= flonum_from_obj(r[2])); } + { const flonum_t v14244_tmp = ((flonum_t)(+1)); + r[3] = obj_from_bool((v14244_tmp) <= flonum_from_obj(r[2])); } } if (bool_from_obj(r[3])) { if ((is_fixnum_obj(r[2]))) { r[3] = obj_from_bool(fixnum_from_obj(r[2]) <= (+2)); } else { - { const flonum_t v14225_tmp = ((flonum_t)(+2)); - r[3] = obj_from_bool(flonum_from_obj(r[2]) <= (v14225_tmp)); } + { const flonum_t v14243_tmp = ((flonum_t)(+2)); + r[3] = obj_from_bool(flonum_from_obj(r[2]) <= (v14243_tmp)); } } } else { r[3] = obj_from_bool(0); @@ -8790,15 +8796,15 @@ gs_integrable_2Dargc_2Dmatch_3F: /* k igt n */ if ((is_fixnum_obj(r[2]))) { r[3] = obj_from_bool((+2) <= fixnum_from_obj(r[2])); } else { - { const flonum_t v14224_tmp = ((flonum_t)(+2)); - r[3] = obj_from_bool((v14224_tmp) <= flonum_from_obj(r[2])); } + { const flonum_t v14242_tmp = ((flonum_t)(+2)); + r[3] = obj_from_bool((v14242_tmp) <= flonum_from_obj(r[2])); } } if (bool_from_obj(r[3])) { if ((is_fixnum_obj(r[2]))) { r[3] = obj_from_bool(fixnum_from_obj(r[2]) <= (+3)); } else { - { const flonum_t v14223_tmp = ((flonum_t)(+3)); - r[3] = obj_from_bool(flonum_from_obj(r[2]) <= (v14223_tmp)); } + { const flonum_t v14241_tmp = ((flonum_t)(+3)); + r[3] = obj_from_bool(flonum_from_obj(r[2]) <= (v14241_tmp)); } } } else { r[3] = obj_from_bool(0); @@ -8808,8 +8814,8 @@ gs_integrable_2Dargc_2Dmatch_3F: /* k igt n */ if ((is_fixnum_obj(r[2]))) { r[3] = obj_from_bool(fixnum_from_obj(r[2]) >= (+0)); } else { - { const flonum_t v14222_tmp = ((flonum_t)(+0)); - r[3] = obj_from_bool(flonum_from_obj(r[2]) >= (v14222_tmp)); } + { const flonum_t v14240_tmp = ((flonum_t)(+0)); + r[3] = obj_from_bool(flonum_from_obj(r[2]) >= (v14240_tmp)); } } } else { r[3] = obj_from_bool(((((r[1]) == obj_from_char('@')) || ((is_flonum_obj(r[1])) && (0))) && (1)) && (0)); @@ -8900,7 +8906,7 @@ case 98: /* clo ek r */ r[0] = r[6]; r[1] = r[3]; /* r[2] */ - goto s_loop_v13438; + goto s_loop_v13456; } else { { /* define integrable-global */ static obj c[] = { obj_from_objptr(vmcases+11) }; @@ -8920,7 +8926,7 @@ case 98: /* clo ek r */ goto jump; } -s_loop_v13438: /* k l env */ +s_loop_v13456: /* k l env */ if ((ispair((r[1])))) { r[3] = (cdr((r[1]))); hreserve(hbsz(3+1), 4); /* 4 live regs */ @@ -8932,7 +8938,7 @@ s_loop_v13438: /* k l env */ r[0] = r[4]; r[1] = r[3]; /* r[2] */ - goto s_loop_v13438; + goto s_loop_v13456; } else { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -9063,7 +9069,7 @@ gs_xform_2Dlambda: /* k tail env */ r[4+4] = r[0]; r += 4; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v13352; + goto s_l_v13370; } case 104: /* clo ek r */ @@ -9073,7 +9079,7 @@ case 104: /* clo ek r */ r[1+3] = p[2]; r[1+4] = p[3]; } r += 1; /* shift reg. wnd */ -s_l_v13352: /* ek r env tail k */ +s_l_v13370: /* ek r env tail k */ if (bool_from_obj(r[1])) { r[5] = (car((r[3]))); r[6+0] = r[4]; @@ -9083,7 +9089,7 @@ s_l_v13352: /* ek r env tail k */ r[6+4] = r[3]; r += 6; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v13353; + goto s_loop_v13371; } else { { /* cons */ hreserve(hbsz(3), 5); /* 5 live regs */ @@ -9106,7 +9112,7 @@ case 105: /* clo k vars ienv ipars */ { obj* p = objptr_from_obj(r[0]); r[1+4] = p[1]; } r += 1; /* shift reg. wnd */ -s_loop_v13353: /* k vars ienv ipars tail */ +s_loop_v13371: /* k vars ienv ipars tail */ if ((ispair((r[1])))) { r[5] = (car((r[1]))); hreserve(hbsz(1+1), 6); /* 6 live regs */ @@ -9247,13 +9253,13 @@ case 109: /* clo ek r */ *--hp = r[1]; *--hp = obj_from_size(PAIR_BTAG); r[4] = (hendblk(3)); } - { fixnum_t v14221_tmp; + { fixnum_t v14239_tmp; { /* length */ int n; obj l = r[3]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14221_tmp = (n); } + v14239_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14221_tmp); + obj l, o = mknull(); int c = (v14239_tmp); hreserve(hbsz(3)*c, 5); /* 5 live regs */ l = r[3]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -9367,25 +9373,25 @@ case 113: /* clo ek r */ *--hp = r[1]; *--hp = obj_from_size(PAIR_BTAG); r[5] = (hendblk(3)); } - { fixnum_t v14219_tmp; + { fixnum_t v14237_tmp; { /* length */ int n; obj l = r[4]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14219_tmp = (n); } + v14237_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14219_tmp); + obj l, o = mknull(); int c = (v14237_tmp); hreserve(hbsz(3)*c, 6); /* 6 live regs */ l = r[4]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); } r[6] = (o); } } - { fixnum_t v14220_tmp; + { fixnum_t v14238_tmp; { /* length */ int n; obj l = r[6]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14220_tmp = (n); } + v14238_tmp = (n); } { /* append */ - obj t, l, o, *p, *d; int c = (v14220_tmp); + obj t, l, o, *p, *d; int c = (v14238_tmp); hreserve(hbsz(3)*c, 7); /* 7 live regs */ l = r[6]; t = r[3]; /* gc-safe */ o = t; p = &o; @@ -9426,7 +9432,7 @@ gs_xform_2Dlambda_2A: /* k tail env */ r[0] = r[3]; /* r[1] */ /* r[2] */ - goto s_loop_v13308; + goto s_loop_v13326; } else { { /* cons */ hreserve(hbsz(3), 3); /* 3 live regs */ @@ -9445,7 +9451,7 @@ gs_xform_2Dlambda_2A: /* k tail env */ goto jump; } -s_loop_v13308: /* k l env */ +s_loop_v13326: /* k l env */ if ((ispair((r[1])))) { r[3] = (cdr((r[1]))); hreserve(hbsz(3+1), 4); /* 4 live regs */ @@ -9457,7 +9463,7 @@ s_loop_v13308: /* k l env */ r[0] = r[4]; r[1] = r[3]; /* r[2] */ - goto s_loop_v13308; + goto s_loop_v13326; } else { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -9519,7 +9525,7 @@ case 115: /* clo ek r */ r[9+4] = r[8]; r += 9; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v13312; + goto s_l_v13330; } else { r[0] = r[6]; r[1] = (car((r[5]))); @@ -9538,7 +9544,7 @@ case 115: /* clo ek r */ r[8+4] = r[7]; r += 8; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v13312; + goto s_l_v13330; } case 116: /* clo ek r */ @@ -9570,7 +9576,7 @@ case 117: /* clo ek r */ r[1+3] = p[2]; r[1+4] = p[3]; } r += 1; /* shift reg. wnd */ -s_l_v13312: /* ek r env aexp k */ +s_l_v13330: /* ek r env aexp k */ if (bool_from_obj(r[1])) { hreserve(hbsz(2+1), 5); /* 5 live regs */ *--hp = r[4]; @@ -9690,7 +9696,7 @@ gs_xform_2Dsyntax_2Dlambda: /* k tail env */ r[4+4] = r[1]; r += 4; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v13254; + goto s_l_v13272; } case 122: /* clo ek r */ @@ -9700,7 +9706,7 @@ case 122: /* clo ek r */ r[1+3] = p[2]; r[1+4] = p[3]; } r += 1; /* shift reg. wnd */ -s_l_v13254: /* ek r k env tail */ +s_l_v13272: /* ek r k env tail */ if (bool_from_obj(r[1])) { r[5] = (car((r[4]))); r[6] = (cdr((r[4]))); @@ -9743,18 +9749,18 @@ case 123: /* clo k use useenv */ r += 1; /* shift reg. wnd */ /* k use useenv forms env vars */ if (bool_from_obj(cxs_list1_2B_3F((r[1])))) { - { fixnum_t v14218_tmp; - { fixnum_t v14217_tmp; + { fixnum_t v14236_tmp; + { fixnum_t v14235_tmp; { /* length */ int n; obj l = r[5]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14218_tmp = (n); } + v14236_tmp = (n); } r[6] = (cdr((r[1]))); { /* length */ int n; obj l = r[6]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14217_tmp = (n); } - r[6] = obj_from_bool((v14218_tmp) == (v14217_tmp)); } } + v14235_tmp = (n); } + r[6] = obj_from_bool((v14236_tmp) == (v14235_tmp)); } } } else { r[6] = obj_from_bool(0); } @@ -9768,7 +9774,7 @@ case 123: /* clo k use useenv */ r[7+5] = r[3]; r += 7; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v13257; + goto s_loop_v13275; } else { r[6+0] = (cx_x_2Derror); pc = objptr_from_obj(r[6+0])[0]; @@ -9787,7 +9793,7 @@ case 124: /* clo k vars exps env */ r[1+4] = p[1]; r[1+5] = p[2]; } r += 1; /* shift reg. wnd */ -s_loop_v13257: /* k vars exps env useenv forms */ +s_loop_v13275: /* k vars exps env useenv forms */ if ((isnull((r[1])))) { hreserve(hbsz(1+1), 6); /* 6 live regs */ *--hp = r[0]; @@ -10149,8 +10155,8 @@ gs_xform_2Dbody: /* k tail env */ rc = 3; goto jump; } else { - { const bool_t v14216_tmp = (islist((r[1]))); - r[3] = obj_from_bool(!(v14216_tmp)); } + { const bool_t v14234_tmp = (islist((r[1]))); + r[3] = obj_from_bool(!(v14234_tmp)); } if (bool_from_obj(r[3])) { { /* cons */ hreserve(hbsz(3), 3); /* 3 live regs */ @@ -10176,14 +10182,14 @@ gs_xform_2Dbody: /* k tail env */ r[3+5] = r[1]; r += 3; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v13138; + goto s_loop_v13156; } } case 138: /* clo k env ids inits nids body */ assert(rc == 7); r += 1; /* shift reg. wnd */ -s_loop_v13138: /* k env ids inits nids body */ +s_loop_v13156: /* k env ids inits nids body */ if ((ispair((r[5])))) { r[6] = (car((r[5]))); r[6] = obj_from_bool(ispair((r[6]))); @@ -10219,37 +10225,37 @@ s_loop_v13138: /* k env ids inits nids body */ rreserve(MAX_HOSTREGS); goto gs_xform; } else { - { fixnum_t v14215_tmp; + { fixnum_t v14233_tmp; { /* length */ int n; obj l = r[2]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14215_tmp = (n); } + v14233_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14215_tmp); + obj l, o = mknull(); int c = (v14233_tmp); hreserve(hbsz(3)*c, 6); /* 6 live regs */ l = r[2]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); } r[6] = (o); } } - { fixnum_t v14214_tmp; + { fixnum_t v14232_tmp; { /* length */ int n; obj l = r[3]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14214_tmp = (n); } + v14232_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14214_tmp); + obj l, o = mknull(); int c = (v14232_tmp); hreserve(hbsz(3)*c, 7); /* 7 live regs */ l = r[3]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); } r[7] = (o); } } - { fixnum_t v14213_tmp; + { fixnum_t v14231_tmp; { /* length */ int n; obj l = r[4]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14213_tmp = (n); } + v14231_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14213_tmp); + obj l, o = mknull(); int c = (v14231_tmp); hreserve(hbsz(3)*c, 8); /* 8 live regs */ l = r[4]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -10283,13 +10289,13 @@ case 139: /* clo ek r */ /* ek r body first loop rest nids inits ids env k tail */ if ((((r[1]) == (mksymbol(internsym("begin")))) && (1))) { if ((islist((r[11])))) { - { fixnum_t v14212_tmp; + { fixnum_t v14230_tmp; { /* length */ int n; obj l = (r[11]); for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14212_tmp = (n); } + v14230_tmp = (n); } { /* append */ - obj t, l, o, *p, *d; int c = (v14212_tmp); + obj t, l, o, *p, *d; int c = (v14230_tmp); hreserve(hbsz(3)*c, 12); /* 12 live regs */ l = (r[11]); t = r[5]; /* gc-safe */ o = t; p = &o; @@ -10457,37 +10463,37 @@ case 139: /* clo ek r */ rc = 4; goto jump; } else { - { fixnum_t v14211_tmp; + { fixnum_t v14229_tmp; { /* length */ int n; obj l = r[8]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14211_tmp = (n); } + v14229_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14211_tmp); + obj l, o = mknull(); int c = (v14229_tmp); hreserve(hbsz(3)*c, 12); /* 12 live regs */ l = r[8]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); } r[12] = (o); } } - { fixnum_t v14210_tmp; + { fixnum_t v14228_tmp; { /* length */ int n; obj l = r[7]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14210_tmp = (n); } + v14228_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14210_tmp); + obj l, o = mknull(); int c = (v14228_tmp); hreserve(hbsz(3)*c, 13); /* 13 live regs */ l = r[7]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); } r[13] = (o); } } - { fixnum_t v14209_tmp; + { fixnum_t v14227_tmp; { /* length */ int n; obj l = r[6]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14209_tmp = (n); } + v14227_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14209_tmp); + obj l, o = mknull(); int c = (v14227_tmp); hreserve(hbsz(3)*c, 14); /* 14 live regs */ l = r[6]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -10710,7 +10716,7 @@ gs_xform_2Dlabels: /* k ids inits nids body env */ r[6+7] = r[4]; r += 6; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v13047; + goto s_loop_v13065; case 146: /* clo k ids inits nids sets lids */ assert(rc == 7); @@ -10718,7 +10724,7 @@ case 146: /* clo k ids inits nids sets lids */ r[1+6] = p[1]; r[1+7] = p[2]; } r += 1; /* shift reg. wnd */ -s_loop_v13047: /* k ids inits nids sets lids env body */ +s_loop_v13065: /* k ids inits nids sets lids env body */ hreserve(hbsz(2+1), 8); /* 8 live regs */ *--hp = r[7]; *--hp = r[6]; @@ -10734,7 +10740,7 @@ s_loop_v13047: /* k ids inits nids sets lids env body */ r[0] = r[9]; r[1] = r[7]; r[2] = r[6]; - goto s_loop_v13095; + goto s_loop_v13113; } else { r[9] = (car((r[1]))); r[9] = obj_from_bool(!bool_from_obj(r[9])); @@ -10810,7 +10816,7 @@ s_loop_v13047: /* k ids inits nids sets lids env body */ } } -s_loop_v13095: /* k l env */ +s_loop_v13113: /* k l env */ if ((ispair((r[1])))) { r[3] = (cdr((r[1]))); hreserve(hbsz(3+1), 4); /* 4 live regs */ @@ -10822,7 +10828,7 @@ s_loop_v13095: /* k l env */ r[0] = r[4]; r[1] = r[3]; /* r[2] */ - goto s_loop_v13095; + goto s_loop_v13113; } else { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -10884,25 +10890,25 @@ case 149: /* clo ek r */ r[1+4] = p[3]; } r += 1; /* shift reg. wnd */ /* ek r k lids sets */ - { fixnum_t v14207_tmp; + { fixnum_t v14225_tmp; { /* length */ int n; obj l = r[4]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14207_tmp = (n); } + v14225_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14207_tmp); + obj l, o = mknull(); int c = (v14225_tmp); hreserve(hbsz(3)*c, 5); /* 5 live regs */ l = r[4]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); } r[5] = (o); } } - { fixnum_t v14208_tmp; + { fixnum_t v14226_tmp; { /* length */ int n; obj l = r[5]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14208_tmp = (n); } + v14226_tmp = (n); } { /* append */ - obj t, l, o, *p, *d; int c = (v14208_tmp); + obj t, l, o, *p, *d; int c = (v14226_tmp); hreserve(hbsz(3)*c, 6); /* 6 live regs */ l = r[5]; t = r[1]; /* gc-safe */ o = t; p = &o; @@ -10938,10 +10944,10 @@ case 149: /* clo ek r */ r[8] = (hendblk(3+1)); r[0] = r[8]; r[1] = r[3]; - goto s_loop_v13080; + goto s_loop_v13098; } -s_loop_v13080: /* k l */ +s_loop_v13098: /* k l */ if ((ispair((r[1])))) { r[2] = (cdr((r[1]))); hreserve(hbsz(1+1), 3); /* 3 live regs */ @@ -10950,7 +10956,7 @@ s_loop_v13080: /* k l */ r[3] = (hendblk(1+1)); r[0] = r[3]; r[1] = r[2]; - goto s_loop_v13080; + goto s_loop_v13098; } else { r[2+0] = r[0]; pc = objptr_from_obj(r[2+0])[0]; @@ -10997,13 +11003,13 @@ case 151: /* clo ek r */ *--hp = r[3]; *--hp = obj_from_size(PAIR_BTAG); r[5] = (hendblk(3)); } - { fixnum_t v14206_tmp; + { fixnum_t v14224_tmp; { /* length */ int n; obj l = r[2]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14206_tmp = (n); } + v14224_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14206_tmp); + obj l, o = mknull(); int c = (v14224_tmp); hreserve(hbsz(3)*c, 6); /* 6 live regs */ l = r[2]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -11784,7 +11790,7 @@ s_collect: /* k x inc l ellipsis-pair? pred? */ r[8+4] = r[1]; r += 8; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v12876; + goto s_l_v12894; } } else { if ((isvector((r[1])))) { @@ -11839,7 +11845,7 @@ case 179: /* clo ek r */ r[1+3] = p[2]; r[1+4] = p[3]; } r += 1; /* shift reg. wnd */ -s_l_v12876: /* ek r k l x */ +s_l_v12894: /* ek r k l x */ if (bool_from_obj(r[1])) { { /* cons */ hreserve(hbsz(3), 5); /* 5 live regs */ @@ -11974,7 +11980,7 @@ case 183: /* clo k use use-env */ r[9+8] = r[7]; r += 9; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v12556; + goto s_loop_v12574; case 184: /* clo k rules */ assert(rc == 3); @@ -11987,7 +11993,7 @@ case 184: /* clo k rules */ r[1+7] = p[6]; r[1+8] = p[7]; } r += 1; /* shift reg. wnd */ -s_loop_v12556: /* k rules use-env pat-literals use mac-env not-pat-literal? ellipsis-pair? list-ids */ +s_loop_v12574: /* k rules use-env pat-literals use mac-env not-pat-literal? ellipsis-pair? list-ids */ hreserve(hbsz(7+1), 9); /* 9 live regs */ *--hp = r[8]; *--hp = r[7]; @@ -12045,7 +12051,7 @@ s_loop_v12556: /* k rules use-env pat-literals use mac-env not-pat-literal? elli r[11+11] = r[1]; r += 11; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v12558; + goto s_l_v12576; } case 185: /* clo ek . */ @@ -12063,7 +12069,7 @@ case 185: /* clo ek . */ r[1+10] = p[9]; r[1+11] = p[10]; } r += 1; /* shift reg. wnd */ -s_l_v12558: /* ek . use-env pat-literals use loop mac-env not-pat-literal? ellipsis-pair? list-ids k rules */ +s_l_v12576: /* ek . use-env pat-literals use loop mac-env not-pat-literal? ellipsis-pair? list-ids k rules */ r[12] = (car((r[11]))); r[13] = (car((r[12]))); r[14] = (cdr((r[12]))); @@ -12187,9 +12193,9 @@ case 187: /* clo ek r */ r[0] = (r[12]); /* r[1] */ /* r[2] */ - goto s_loop_v12809; + goto s_loop_v12827; -s_loop_v12809: /* k l mac-env */ +s_loop_v12827: /* k l mac-env */ if ((ispair((r[1])))) { r[3] = (cdr((r[1]))); hreserve(hbsz(3+1), 4); /* 4 live regs */ @@ -12201,7 +12207,7 @@ s_loop_v12809: /* k l mac-env */ r[0] = r[4]; r[1] = r[3]; /* r[2] */ - goto s_loop_v12809; + goto s_loop_v12827; } else { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -12483,7 +12489,7 @@ s_expand_2Dpart: /* k tmpl ellipsis-pair? list-ids ellipsis-vars expand new-lite r[11+8] = r[1]; r += 11; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v12703; + goto s_l_v12721; } } } @@ -12494,13 +12500,13 @@ case 195: /* clo ek r */ r[1+2] = p[1]; } r += 1; /* shift reg. wnd */ /* ek r k */ - { fixnum_t v14205_tmp; + { fixnum_t v14223_tmp; { /* length */ int n; obj l = r[1]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14205_tmp = (n); } + v14223_tmp = (n); } { /* list->vector */ - obj l; int i, c = (v14205_tmp); + obj l; int i, c = (v14223_tmp); hreserve(hbsz(c+1), 3); /* 3 live regs */ l = r[1]; /* gc-safe */ for (i = 0; i < c; ++i, l = cdr(l)) hp[i-c] = car(l); @@ -12526,7 +12532,7 @@ case 196: /* clo ek r */ r[1+7] = p[6]; r[1+8] = p[7]; } r += 1; /* shift reg. wnd */ -s_l_v12703: /* ek r list-ids ellipsis-vars bindings expand-part k expand tmpl */ +s_l_v12721: /* ek r list-ids ellipsis-vars bindings expand-part k expand tmpl */ if (bool_from_obj(r[1])) { hreserve(hbsz(5+1), 9); /* 9 live regs */ *--hp = r[8]; @@ -12629,7 +12635,7 @@ case 197: /* clo ek r */ r[0] = r[8]; /* r[1] */ /* r[2] */ - goto s_loop_v12742; + goto s_loop_v12760; } case 198: /* clo k vals */ @@ -12718,7 +12724,7 @@ case 201: /* clo ek r */ rc = 3; goto jump; -s_loop_v12742: /* k l bindings */ +s_loop_v12760: /* k l bindings */ if ((ispair((r[1])))) { r[3] = (cdr((r[1]))); hreserve(hbsz(3+1), 4); /* 4 live regs */ @@ -12730,7 +12736,7 @@ s_loop_v12742: /* k l bindings */ r[0] = r[4]; r[1] = r[3]; /* r[2] */ - goto s_loop_v12742; + goto s_loop_v12760; } else { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -12832,13 +12838,13 @@ case 205: /* clo ek r */ r[1+3] = p[2]; } r += 1; /* shift reg. wnd */ /* ek r k r */ - { fixnum_t v14204_tmp; + { fixnum_t v14222_tmp; { /* length */ int n; obj l = r[3]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14204_tmp = (n); } + v14222_tmp = (n); } { /* append */ - obj t, l, o, *p, *d; int c = (v14204_tmp); + obj t, l, o, *p, *d; int c = (v14222_tmp); hreserve(hbsz(3)*c, 4); /* 4 live regs */ l = r[3]; t = r[1]; /* gc-safe */ o = t; p = &o; @@ -13021,7 +13027,7 @@ s_match: /* k pat sexp bindings ellipsis-pair? list-ids not-pat-literal? use-env r[1] = obj_from_bool(0); r[2] = (r[10]); /* r[3] */ - goto s_l_v12669; + goto s_l_v12687; } } else { { /* cons */ @@ -13065,7 +13071,7 @@ s_match: /* k pat sexp bindings ellipsis-pair? list-ids not-pat-literal? use-env r[14+6] = r[0]; r += 14; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v12651; + goto s_l_v12669; } else { r[0] = (r[10]); pc = objptr_from_obj(r[0])[0]; @@ -13082,7 +13088,7 @@ s_match: /* k pat sexp bindings ellipsis-pair? list-ids not-pat-literal? use-env r[1] = (r[13]); r[2] = (r[10]); /* r[3] */ - goto s_l_v12669; + goto s_l_v12687; } else { hreserve(hbsz(8+1), 13); /* 13 live regs */ *--hp = r[1]; @@ -13113,7 +13119,7 @@ case 212: /* clo k condition */ r[1+2] = p[1]; r[1+3] = p[2]; } r += 1; /* shift reg. wnd */ -s_l_v12669: /* k condition return bindings */ +s_l_v12687: /* k condition return bindings */ if (bool_from_obj(r[1])) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -13183,7 +13189,7 @@ case 215: /* clo ek . */ r[1+5] = p[4]; r[1+6] = p[5]; } r += 1; /* shift reg. wnd */ -s_l_v12651: /* ek . match bindings sexp pat k */ +s_l_v12669: /* ek . match bindings sexp pat k */ { /* vector->list */ obj v, l = mknull(); int c = (vectorlen((r[5]))); hreserve(hbsz(3)*c, 7); /* 7 live regs */ @@ -13259,7 +13265,7 @@ case 216: /* clo ek r */ r[13+10] = (r[10]); r += 13; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v12571; + goto s_l_v12589; } else { r[0] = r[2]; pc = objptr_from_obj(r[0])[0]; @@ -13311,7 +13317,7 @@ case 217: /* clo ek r */ r[1+9] = p[8]; r[1+10] = p[9]; } r += 1; /* shift reg. wnd */ -s_l_v12571: /* ek r return list-ids not-pat-literal? match bindings pat k sexp tail-len */ +s_l_v12589: /* ek r return list-ids not-pat-literal? match bindings pat k sexp tail-len */ hreserve(hbsz(9+1), 11); /* 11 live regs */ *--hp = (r[10]); *--hp = r[1]; @@ -13346,7 +13352,7 @@ s_l_v12571: /* ek r return list-ids not-pat-literal? match bindings pat k sexp t r[12+10] = (r[10]); r += 12; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v12573; + goto s_l_v12591; } case 218: /* clo ek . */ @@ -13363,35 +13369,35 @@ case 218: /* clo ek . */ r[1+9] = p[8]; r[1+10] = p[9]; } r += 1; /* shift reg. wnd */ -s_l_v12573: /* ek . list-ids not-pat-literal? match bindings pat k sexp r tail-len */ - { const fixnum_t v14201_tail_2Dlen = fixnum_from_obj(r[10]); +s_l_v12591: /* ek . list-ids not-pat-literal? match bindings pat k sexp r tail-len */ + { const fixnum_t v14219_tail_2Dlen = fixnum_from_obj(r[10]); { /* list-tail */ - obj l = r[8]; int c = (fxsub(fixnum_from_obj(r[9]), (v14201_tail_2Dlen))); + obj l = r[8]; int c = (fxsub(fixnum_from_obj(r[9]), (v14219_tail_2Dlen))); while (c-- > 0) l = cdr(l); r[11] = (l); } - { fixnum_t v14202_tmp; + { fixnum_t v14220_tmp; { /* length */ int n; obj l = r[8]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14202_tmp = (n); } + v14220_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14202_tmp); + obj l, o = mknull(); int c = (v14220_tmp); hreserve(hbsz(3)*c, 12); /* 12 live regs */ l = r[8]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); } r[12] = (o); } } { /* list-tail */ - obj l = (r[12]); int c = (v14201_tail_2Dlen); + obj l = (r[12]); int c = (v14219_tail_2Dlen); while (c-- > 0) l = cdr(l); r[12] = (l); } - { fixnum_t v14203_tmp; + { fixnum_t v14221_tmp; { /* length */ int n; obj l = (r[12]); for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14203_tmp = (n); } + v14221_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14203_tmp); + obj l, o = mknull(); int c = (v14221_tmp); hreserve(hbsz(3)*c, 13); /* 13 live regs */ l = (r[12]); /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -13441,9 +13447,9 @@ case 219: /* clo ek r */ r[1] = r[2]; r[2] = r[3]; r[3] = r[6]; - goto s_loop_v12594; + goto s_loop_v12612; -s_loop_v12594: /* k l match pat */ +s_loop_v12612: /* k l match pat */ if ((ispair((r[1])))) { r[4] = (cdr((r[1]))); hreserve(hbsz(4+1), 5); /* 5 live regs */ @@ -13457,7 +13463,7 @@ s_loop_v12594: /* k l match pat */ r[1] = r[4]; /* r[2] */ /* r[3] */ - goto s_loop_v12594; + goto s_loop_v12612; } else { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -13511,9 +13517,9 @@ case 221: /* clo ek r */ r[0] = r[5]; /* r[1] */ /* r[2] */ - goto s_loop_v12605; + goto s_loop_v12623; -s_loop_v12605: /* k l f */ +s_loop_v12623: /* k l f */ if ((ispair((r[1])))) { r[3] = (cdr((r[1]))); hreserve(hbsz(3+1), 4); /* 4 live regs */ @@ -13525,7 +13531,7 @@ s_loop_v12605: /* k l f */ r[0] = r[4]; r[1] = r[3]; /* r[2] */ - goto s_loop_v12605; + goto s_loop_v12623; } else { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -13676,13 +13682,13 @@ case 227: /* clo ek r */ r[1+3] = p[2]; } r += 1; /* shift reg. wnd */ /* ek r k r */ - { fixnum_t v14200_tmp; + { fixnum_t v14218_tmp; { /* length */ int n; obj l = r[3]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14200_tmp = (n); } + v14218_tmp = (n); } { /* append */ - obj t, l, o, *p, *d; int c = (v14200_tmp); + obj t, l, o, *p, *d; int c = (v14218_tmp); hreserve(hbsz(3)*c, 4); /* 4 live regs */ l = r[3]; t = r[1]; /* gc-safe */ o = t; p = &o; @@ -13911,6 +13917,9 @@ case 236: /* clo ek r */ *--hp = obj_from_bool(0); *--hp = obj_from_size(PAIR_BTAG); cx__2Adynamic_2Dstate_2A = (hendblk(3)); } + cx__2Acurrent_2Dinput_2A = obj_from_bool(0); + cx__2Acurrent_2Doutput_2A = obj_from_bool(0); + cx__2Acurrent_2Derror_2A = obj_from_bool(0); hreserve(hbsz(0+1), 3); /* 3 live regs */ *--hp = obj_from_case(238); r[3] = (hendblk(0+1)); @@ -13968,7 +13977,7 @@ case 236: /* clo ek r */ r[0] = r[3]; pc = objptr_from_obj(r[0])[0]; r[1] = r[4]; - r[2] = (cx__233369); + r[2] = (cx__233372); rreserve(MAX_HOSTREGS); rc = 3; goto jump; @@ -14017,7 +14026,7 @@ case 238: /* clo k msg args */ r += 1; /* shift reg. wnd */ /* k msg args */ { /* string-append */ - int *d = stringcat(stringdata((cx__231903)), stringdata((r[1]))); + int *d = stringcat(stringdata((cx__231906)), stringdata((r[1]))); r[3] = (hpushstr(3, d)); } /* r[0] */ r[1] = r[3]; @@ -14028,8 +14037,8 @@ case 239: /* write-serialized-char k x port */ assert(rc == 4); r += 1; /* shift reg. wnd */ gs_write_2Dserialized_2Dchar: /* k x port */ - { const char_t v14199_x = char_from_obj(r[1]); - if ((((v14199_x) == ('%')) || (((v14199_x) == (34)) || (((v14199_x) == (92)) || (((v14199_x) < (' ')) || ((v14199_x) > ('~'))))))) { + { const char_t v14217_x = char_from_obj(r[1]); + if ((((v14217_x) == ('%')) || (((v14217_x) == (34)) || (((v14217_x) == (92)) || (((v14217_x) < (' ')) || ((v14217_x) > ('~'))))))) { (void)(oportputc(('%'), (r[2]))); hreserve(hbsz(2+1), 3); /* 3 live regs */ *--hp = r[2]; @@ -14039,7 +14048,7 @@ gs_write_2Dserialized_2Dchar: /* k x port */ r[4+0] = (cx_fixnum_2D_3Estring); pc = objptr_from_obj(r[4+0])[0]; r[4+1] = r[3]; - r[4+2] = obj_from_fixnum((fixnum_t)(v14199_x)); + r[4+2] = obj_from_fixnum((fixnum_t)(v14217_x)); r[4+3] = obj_from_fixnum(+16); r += 4; /* shift reg wnd */ rreserve(MAX_HOSTREGS); @@ -14049,7 +14058,7 @@ gs_write_2Dserialized_2Dchar: /* k x port */ /* r[0] */ pc = objptr_from_obj(r[0])[0]; r[1] = obj_from_ktrap(); - r[2] = obj_from_void(oportputc((v14199_x), (r[2]))); + r[2] = obj_from_void(oportputc((v14217_x), (r[2]))); rreserve(MAX_HOSTREGS); rc = 3; goto jump; @@ -14358,7 +14367,7 @@ gs_write_2Dserialized_2Dsexp: /* k x port */ r[3+0] = (cx_c_2Derror); pc = objptr_from_obj(r[3+0])[0]; r[3+1] = r[0]; - r[3+2] = (cx__231948); + r[3+2] = (cx__231951); r[3+3] = r[1]; r += 3; /* shift reg wnd */ rreserve(MAX_HOSTREGS); @@ -14405,14 +14414,14 @@ case 249: /* clo ek r */ r[0] = r[3]; r[1] = r[2]; r[2] = r[4]; - goto s_loop_v12413; + goto s_loop_v12431; case 250: /* clo k x */ assert(rc == 3); { obj* p = objptr_from_obj(r[0]); r[1+2] = p[1]; } r += 1; /* shift reg. wnd */ -s_loop_v12413: /* k x port */ +s_loop_v12431: /* k x port */ if ((isnull((r[1])))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -14521,7 +14530,7 @@ case 254: /* clo ek r */ r[5+3] = r[2]; r += 5; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v12384; + goto s_loop_v12402; case 255: /* clo k i */ assert(rc == 3); @@ -14529,7 +14538,7 @@ case 255: /* clo k i */ r[1+2] = p[1]; r[1+3] = p[2]; } r += 1; /* shift reg. wnd */ -s_loop_v12384: /* k i port x */ +s_loop_v12402: /* k i port x */ if ((fixnum_from_obj(r[1]) == (vectorlen((r[3]))))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -14598,7 +14607,7 @@ case 257: /* clo ek r */ r[5+3] = r[2]; r += 5; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v12367; + goto s_loop_v12385; case 258: /* clo k i */ assert(rc == 3); @@ -14606,7 +14615,7 @@ case 258: /* clo k i */ r[1+2] = p[1]; r[1+3] = p[2]; } r += 1; /* shift reg. wnd */ -s_loop_v12367: /* k i port x */ +s_loop_v12385: /* k i port x */ if ((fixnum_from_obj(r[1]) == (stringlen((r[3]))))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -14666,7 +14675,7 @@ case 260: /* clo ek r */ r[5+3] = r[2]; r += 5; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v12350; + goto s_loop_v12368; case 261: /* clo k i */ assert(rc == 3); @@ -14674,7 +14683,7 @@ case 261: /* clo k i */ r[1+2] = p[1]; r[1+3] = p[2]; } r += 1; /* shift reg. wnd */ -s_loop_v12350: /* k i port x */ +s_loop_v12368: /* k i port x */ if ((fixnum_from_obj(r[1]) == (bytevectorlen((r[3]))))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -14734,7 +14743,7 @@ case 263: /* clo ek r */ r[5+3] = r[2]; r += 5; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v12333; + goto s_loop_v12351; case 264: /* clo k i */ assert(rc == 3); @@ -14742,7 +14751,7 @@ case 264: /* clo k i */ r[1+2] = p[1]; r[1+3] = p[2]; } r += 1; /* shift reg. wnd */ -s_loop_v12333: /* k i port x */ +s_loop_v12351: /* k i port x */ if ((fixnum_from_obj(r[1]) == (stringlen((r[3]))))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -14792,8 +14801,8 @@ case 266: /* write-serialized-arg k arg port */ gs_write_2Dserialized_2Darg: /* k arg port */ if (((is_fixnum_obj(r[1])) || (is_flonum_obj(r[1])))) { if ((is_fixnum_obj(r[1]))) { - { const fixnum_t v14198_arg = fixnum_from_obj(r[1]); - r[3] = obj_from_bool(((+0) <= (v14198_arg)) && ((v14198_arg) <= (+9))); } + { const fixnum_t v14216_arg = fixnum_from_obj(r[1]); + r[3] = obj_from_bool(((+0) <= (v14216_arg)) && ((v14216_arg) <= (+9))); } } else { r[3] = obj_from_bool(0); } @@ -14801,8 +14810,8 @@ gs_write_2Dserialized_2Darg: /* k arg port */ r[3] = obj_from_bool(0); } if (bool_from_obj(r[3])) { - { const char_t v14197_tmp = (*(unsigned char*)stringref((cx__232041), fixnum_from_obj(r[1]))); - r[3] = obj_from_void(oportputc((v14197_tmp), (r[2]))); } + { const char_t v14215_tmp = (*(unsigned char*)stringref((cx__232044), fixnum_from_obj(r[1]))); + r[3] = obj_from_void(oportputc((v14215_tmp), (r[2]))); } r[4+0] = r[0]; pc = objptr_from_obj(r[4+0])[0]; r[4+1] = obj_from_ktrap(); @@ -15340,9 +15349,9 @@ case 280: /* clo k clauses */ r[0] = r[4]; /* r[1] */ r[2] = r[3]; - goto s_loop_v12216; + goto s_loop_v12234; -s_loop_v12216: /* k l f */ +s_loop_v12234: /* k l f */ if ((ispair((r[1])))) { r[3] = (cdr((r[1]))); hreserve(hbsz(3+1), 4); /* 4 live regs */ @@ -15354,7 +15363,7 @@ s_loop_v12216: /* k l f */ r[0] = r[4]; r[1] = r[3]; /* r[2] */ - goto s_loop_v12216; + goto s_loop_v12234; } else { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -15678,7 +15687,7 @@ case 299: /* clo k tail */ r[3+0] = (cx_c_2Derror); pc = objptr_from_obj(r[3+0])[0]; r[3+1] = r[0]; - r[3+2] = (cx__232062); + r[3+2] = (cx__232065); r[3+3] = r[2]; r += 3; /* shift reg wnd */ rreserve(MAX_HOSTREGS); @@ -16174,9 +16183,9 @@ case 312: /* clo k clauses */ r[0] = r[4]; /* r[1] */ r[2] = r[3]; - goto s_loop_v11999; + goto s_loop_v12017; -s_loop_v11999: /* k l f */ +s_loop_v12017: /* k l f */ if ((ispair((r[1])))) { r[3] = (cdr((r[1]))); hreserve(hbsz(3+1), 4); /* 4 live regs */ @@ -16188,7 +16197,7 @@ s_loop_v11999: /* k l f */ r[0] = r[4]; r[1] = r[3]; /* r[2] */ - goto s_loop_v11999; + goto s_loop_v12017; } else { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -16514,7 +16523,7 @@ case 331: /* clo k tail */ r[3+0] = (cx_c_2Derror); pc = objptr_from_obj(r[3+0])[0]; r[3+1] = r[0]; - r[3+2] = (cx__232062); + r[3+2] = (cx__232065); r[3+3] = r[2]; r += 3; /* shift reg wnd */ rreserve(MAX_HOSTREGS); @@ -16871,7 +16880,7 @@ case 333: /* clo k obj */ r[6+4] = r[3]; r += 6; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v11856; + goto s_l_v11874; } else { if (((((r[1]) == obj_from_bool(0)) || ((is_flonum_obj(r[1])) && (0))) && (1))) { r[5] = obj_from_void(oportputc(('f'), (r[2]))); @@ -16882,7 +16891,7 @@ case 333: /* clo k obj */ r[6+4] = r[3]; r += 6; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v11856; + goto s_l_v11874; } else { if (((((r[1]) == (mknull())) || ((is_flonum_obj(r[1])) && ((is_flonum_obj(mknull())) && (flonum_from_obj(r[1]) == flonum_from_obj(mknull()))))) && (1))) { r[5] = obj_from_void(oportputc(('n'), (r[2]))); @@ -16893,7 +16902,7 @@ case 333: /* clo k obj */ r[6+4] = r[3]; r += 6; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v11856; + goto s_l_v11874; } else { (void)(oportputc((39), (r[2]))); r[0] = r[4]; @@ -16912,7 +16921,7 @@ case 334: /* clo ek . */ r[1+3] = p[2]; r[1+4] = p[3]; } r += 1; /* shift reg. wnd */ -s_l_v11856: /* ek . k port k */ +s_l_v11874: /* ek . k port k */ if (bool_from_obj(r[4])) { (void)(oportputc((']'), (r[3]))); r[0] = r[2]; @@ -17238,7 +17247,7 @@ case 344: /* clo k exps */ r[9+7] = r[7]; r += 9; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v11782; + goto s_loop_v11800; case 345: /* clo k xl */ assert(rc == 3); @@ -17250,7 +17259,7 @@ case 345: /* clo k xl */ r[1+6] = p[5]; r[1+7] = p[6]; } r += 1; /* shift reg. wnd */ -s_loop_v11782: /* k xl port g s f l k */ +s_loop_v11800: /* k xl port g s f l k */ if ((ispair((r[1])))) { r[8] = (cdr((r[1]))); r[8] = obj_from_bool(ispair((r[8]))); @@ -17441,7 +17450,7 @@ case 350: /* clo ek . */ rreserve(MAX_HOSTREGS); goto gs_codegen; } else { - r[10] = obj_from_bool(isequal((r[6]), (cx__232881))); + r[10] = obj_from_bool(isequal((r[6]), (cx__232884))); if (bool_from_obj(r[10])) { r[0] = r[7]; pc = objptr_from_obj(r[0])[0]; @@ -17641,13 +17650,13 @@ case 356: /* clo ek r */ r[1+12] = p[11]; } r += 1; /* shift reg. wnd */ /* ek r f l idsi s g r r exp k k port */ - { fixnum_t v14196_tmp; + { fixnum_t v14214_tmp; { /* length */ int n; obj l = r[7]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14196_tmp = (n); } + v14214_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14196_tmp); + obj l, o = mknull(); int c = (v14214_tmp); hreserve(hbsz(3)*c, 13); /* 13 live regs */ l = r[7]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -17674,7 +17683,7 @@ case 356: /* clo ek r */ r[15+5] = (r[12]); r += 15; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v11711; + goto s_loop_v11729; case 357: /* clo k free l */ assert(rc == 4); @@ -17683,7 +17692,7 @@ case 357: /* clo k free l */ r[1+4] = p[2]; r[1+5] = p[3]; } r += 1; /* shift reg. wnd */ -s_loop_v11711: /* k free l g f port */ +s_loop_v11729: /* k free l g f port */ if ((isnull((r[1])))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -17881,7 +17890,7 @@ case 361: /* clo ek . */ r[12+4] = r[3]; r += 12; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v11686; + goto s_loop_v11704; case 362: /* clo k ids n */ assert(rc == 4); @@ -17889,7 +17898,7 @@ case 362: /* clo k ids n */ r[1+3] = p[1]; r[1+4] = p[2]; } r += 1; /* shift reg. wnd */ -s_loop_v11686: /* k ids n port r */ +s_loop_v11704: /* k ids n port r */ if ((isnull((r[1])))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -17933,7 +17942,7 @@ s_loop_v11686: /* k ids n port r */ r[7+5] = r[0]; r += 7; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v11688; + goto s_l_v11706; } } @@ -17946,7 +17955,7 @@ case 363: /* clo ek . */ r[1+4] = p[3]; r[1+5] = p[4]; } r += 1; /* shift reg. wnd */ -s_l_v11688: /* ek . loop n ids k */ +s_l_v11706: /* ek . loop n ids k */ r[0] = r[2]; pc = objptr_from_obj(r[0])[0]; r[1] = r[5]; @@ -18088,13 +18097,13 @@ case 368: /* clo k clauses */ r[1+7] = p[6]; } r += 1; /* shift reg. wnd */ /* k clauses g s f l k port */ - { fixnum_t v14195_tmp; + { fixnum_t v14213_tmp; { /* length */ int n; obj l = r[1]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14195_tmp = (n); } + v14213_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14195_tmp); + obj l, o = mknull(); int c = (v14213_tmp); hreserve(hbsz(3)*c, 8); /* 8 live regs */ l = r[1]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -18116,7 +18125,7 @@ case 368: /* clo k clauses */ r[10+6] = r[7]; r += 10; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v11629; + goto s_loop_v11647; case 369: /* clo k clauses l */ assert(rc == 4); @@ -18126,7 +18135,7 @@ case 369: /* clo k clauses l */ r[1+5] = p[3]; r[1+6] = p[4]; } r += 1; /* shift reg. wnd */ -s_loop_v11629: /* k clauses l g s f port */ +s_loop_v11647: /* k clauses l g s f port */ if ((isnull((r[1])))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -18244,14 +18253,14 @@ case 372: /* clo ek . */ r[1] = r[2]; r[2] = obj_from_fixnum(+0); r[3] = r[5]; - goto s_loop_v11602; + goto s_loop_v11620; case 373: /* clo k clauses i */ assert(rc == 4); { obj* p = objptr_from_obj(r[0]); r[1+3] = p[1]; } r += 1; /* shift reg. wnd */ -s_loop_v11602: /* k clauses i port */ +s_loop_v11620: /* k clauses i port */ if ((isnull((r[1])))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -18621,7 +18630,7 @@ case 384: /* clo k kexp exp */ /* k kexp exp g s f l port */ r[8] = (car((r[2]))); { /* memq */ - obj x = (r[8]), l = (cx__232716); + obj x = (r[8]), l = (cx__232719); for (; l != mknull(); l = cdr(l)) if (car(l) == x) break; r[8] = (l == mknull() ? obj_from_bool(0) : l); } if (bool_from_obj(r[8])) { @@ -18892,13 +18901,13 @@ case 391: /* clo ek r */ *--hp = obj_from_case(392); r[12] = (hendblk(3+1)); if (((((r[1]) == obj_from_char('0')) || ((is_flonum_obj(r[1])) && (0))) ? (1) : ((((r[1]) == obj_from_char('1')) || ((is_flonum_obj(r[1])) && (0))) ? (1) : ((((r[1]) == obj_from_char('2')) || ((is_flonum_obj(r[1])) && (0))) ? (1) : ((((r[1]) == obj_from_char('3')) || ((is_flonum_obj(r[1])) && (0))) && (1)))))) { - { fixnum_t v14194_tmp; + { fixnum_t v14212_tmp; { /* length */ int n; obj l = r[7]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14194_tmp = (n); } + v14212_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14194_tmp); + obj l, o = mknull(); int c = (v14212_tmp); hreserve(hbsz(3)*c, 13); /* 13 live regs */ l = r[7]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -18917,7 +18926,7 @@ case 391: /* clo ek r */ /* r[4] */ /* r[5] */ r[6] = (r[10]); - goto s_loop_v11481; + goto s_loop_v11499; } else { if (((((r[1]) == obj_from_char('p')) || ((is_flonum_obj(r[1])) && (0))) && (1))) { if ((isnull((r[7])))) { @@ -18938,19 +18947,19 @@ case 391: /* clo ek r */ rc = 4; goto jump; } else { - { fixnum_t v14192_tmp; + { fixnum_t v14210_tmp; { /* length */ int n; obj l = r[7]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14192_tmp = (n); } - r[13] = obj_from_fixnum(fxsub((v14192_tmp), (+1))); } - { fixnum_t v14193_tmp; + v14210_tmp = (n); } + r[13] = obj_from_fixnum(fxsub((v14210_tmp), (+1))); } + { fixnum_t v14211_tmp; { /* length */ int n; obj l = r[7]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14193_tmp = (n); } + v14211_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14193_tmp); + obj l, o = mknull(); int c = (v14211_tmp); hreserve(hbsz(3)*c, 14); /* 14 live regs */ l = r[7]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -18970,7 +18979,7 @@ case 391: /* clo ek r */ /* r[4] */ /* r[5] */ r[6] = (r[10]); - goto s_loop_v11456; + goto s_loop_v11474; } } else { if (((((r[1]) == obj_from_char('m')) || ((is_flonum_obj(r[1])) && (0))) && (1))) { @@ -18999,19 +19008,19 @@ case 391: /* clo ek r */ rc = 4; goto jump; } else { - { fixnum_t v14190_tmp; + { fixnum_t v14208_tmp; { /* length */ int n; obj l = r[7]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14190_tmp = (n); } - r[13] = obj_from_fixnum(fxsub((v14190_tmp), (+1))); } - { fixnum_t v14191_tmp; + v14208_tmp = (n); } + r[13] = obj_from_fixnum(fxsub((v14208_tmp), (+1))); } + { fixnum_t v14209_tmp; { /* length */ int n; obj l = r[7]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14191_tmp = (n); } + v14209_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14191_tmp); + obj l, o = mknull(); int c = (v14209_tmp); hreserve(hbsz(3)*c, 14); /* 14 live regs */ l = r[7]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -19031,23 +19040,23 @@ case 391: /* clo ek r */ /* r[4] */ /* r[5] */ r[6] = (r[10]); - goto s_loop_v11420; + goto s_loop_v11438; } } else { if (((((r[1]) == obj_from_char('c')) || ((is_flonum_obj(r[1])) && (0))) && (1))) { - { fixnum_t v14188_tmp; + { fixnum_t v14206_tmp; { /* length */ int n; obj l = r[7]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14188_tmp = (n); } - r[13] = obj_from_fixnum(fxsub((v14188_tmp), (+1))); } - { fixnum_t v14189_tmp; + v14206_tmp = (n); } + r[13] = obj_from_fixnum(fxsub((v14206_tmp), (+1))); } + { fixnum_t v14207_tmp; { /* length */ int n; obj l = r[7]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14189_tmp = (n); } + v14207_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14189_tmp); + obj l, o = mknull(); int c = (v14207_tmp); hreserve(hbsz(3)*c, 14); /* 14 live regs */ l = r[7]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -19078,19 +19087,19 @@ case 391: /* clo ek r */ goto gs_codegen; } else { if (((((r[1]) == obj_from_char('x')) || ((is_flonum_obj(r[1])) && (0))) && (1))) { - { fixnum_t v14186_tmp; + { fixnum_t v14204_tmp; { /* length */ int n; obj l = r[7]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14186_tmp = (n); } - r[13] = obj_from_fixnum(fxsub((v14186_tmp), (+1))); } - { fixnum_t v14187_tmp; + v14204_tmp = (n); } + r[13] = obj_from_fixnum(fxsub((v14204_tmp), (+1))); } + { fixnum_t v14205_tmp; { /* length */ int n; obj l = r[7]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14187_tmp = (n); } + v14205_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14187_tmp); + obj l, o = mknull(); int c = (v14205_tmp); hreserve(hbsz(3)*c, 14); /* 14 live regs */ l = r[7]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -19110,7 +19119,7 @@ case 391: /* clo ek r */ /* r[4] */ /* r[5] */ r[6] = (r[10]); - goto s_loop_v11366; + goto s_loop_v11384; } else { if (((((r[1]) == obj_from_char('u')) || ((is_flonum_obj(r[1])) && (0))) && (1))) { hreserve(hbsz(3+1), 13); /* 13 live regs */ @@ -19247,13 +19256,13 @@ case 391: /* clo ek r */ } } else { if (((((r[1]) == obj_from_char('#')) || ((is_flonum_obj(r[1])) && (0))) && (1))) { - { fixnum_t v14185_tmp; + { fixnum_t v14203_tmp; { /* length */ int n; obj l = r[7]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14185_tmp = (n); } + v14203_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14185_tmp); + obj l, o = mknull(); int c = (v14203_tmp); hreserve(hbsz(3)*c, 13); /* 13 live regs */ l = r[7]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -19273,12 +19282,12 @@ case 391: /* clo ek r */ /* r[4] */ /* r[5] */ r[6] = (r[10]); - goto s_loop_v11288; + goto s_loop_v11306; } else { r[13+0] = (cx_c_2Derror); pc = objptr_from_obj(r[13+0])[0]; r[13+1] = (r[12]); - r[13+2] = (cx__232409); + r[13+2] = (cx__232412); r[13+3] = r[1]; r += 13; /* shift reg wnd */ rreserve(MAX_HOSTREGS); @@ -19327,7 +19336,7 @@ case 393: /* clo k args l */ r[1+5] = p[3]; r[1+6] = p[4]; } r += 1; /* shift reg. wnd */ -s_loop_v11481: /* k args l g s f port */ +s_loop_v11499: /* k args l g s f port */ if ((isnull((r[1])))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -19439,7 +19448,7 @@ case 397: /* clo k args l */ r[1+5] = p[3]; r[1+6] = p[4]; } r += 1; /* shift reg. wnd */ -s_loop_v11456: /* k args l g s f port */ +s_loop_v11474: /* k args l g s f port */ if ((isnull((r[1])))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -19525,11 +19534,11 @@ case 399: /* clo ek . */ /* r[2] */ /* r[3] */ /* r[4] */ - goto s_loop_v11447; + goto s_loop_v11465; -s_loop_v11447: /* k i r port opc */ - { const fixnum_t v14184_i = fixnum_from_obj(r[1]); - if (((v14184_i) >= fixnum_from_obj(r[4]))) { +s_loop_v11465: /* k i r port opc */ + { const fixnum_t v14202_i = fixnum_from_obj(r[1]); + if (((v14202_i) >= fixnum_from_obj(r[4]))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; r[1] = obj_from_ktrap(); @@ -19540,11 +19549,11 @@ s_loop_v11447: /* k i r port opc */ } else { (void)(oportputs(stringchars((r[2])), (r[3]))); /* r[0] */ - r[1] = obj_from_fixnum(fxadd((v14184_i), (+1))); + r[1] = obj_from_fixnum(fxadd((v14202_i), (+1))); /* r[2] */ /* r[3] */ /* r[4] */ - goto s_loop_v11447; + goto s_loop_v11465; } } case 400: /* clo ek r */ @@ -19602,7 +19611,7 @@ case 402: /* clo k args l */ r[1+5] = p[3]; r[1+6] = p[4]; } r += 1; /* shift reg. wnd */ -s_loop_v11420: /* k args l g s f port */ +s_loop_v11438: /* k args l g s f port */ if ((isnull((r[1])))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -19688,11 +19697,11 @@ case 404: /* clo ek . */ /* r[2] */ /* r[3] */ /* r[4] */ - goto s_loop_v11411; + goto s_loop_v11429; -s_loop_v11411: /* k i r port opc */ - { const fixnum_t v14183_i = fixnum_from_obj(r[1]); - if (((v14183_i) >= fixnum_from_obj(r[4]))) { +s_loop_v11429: /* k i r port opc */ + { const fixnum_t v14201_i = fixnum_from_obj(r[1]); + if (((v14201_i) >= fixnum_from_obj(r[4]))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; r[1] = obj_from_ktrap(); @@ -19703,11 +19712,11 @@ s_loop_v11411: /* k i r port opc */ } else { (void)(oportputs(stringchars((r[2])), (r[3]))); /* r[0] */ - r[1] = obj_from_fixnum(fxadd((v14183_i), (+1))); + r[1] = obj_from_fixnum(fxadd((v14201_i), (+1))); /* r[2] */ /* r[3] */ /* r[4] */ - goto s_loop_v11411; + goto s_loop_v11429; } } case 405: /* clo ek . */ @@ -19749,7 +19758,7 @@ case 405: /* clo ek . */ r[14+6] = (r[10]); r += 14; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v11392; + goto s_loop_v11410; case 406: /* clo k args l */ assert(rc == 4); @@ -19759,7 +19768,7 @@ case 406: /* clo k args l */ r[1+5] = p[3]; r[1+6] = p[4]; } r += 1; /* shift reg. wnd */ -s_loop_v11392: /* k args l g s f port */ +s_loop_v11410: /* k args l g s f port */ if ((isnull((r[1])))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -19852,11 +19861,11 @@ case 408: /* clo ek . */ /* r[2] */ /* r[3] */ /* r[4] */ - goto s_loop_v11383; + goto s_loop_v11401; -s_loop_v11383: /* k i r port opc */ - { const fixnum_t v14182_i = fixnum_from_obj(r[1]); - if (((v14182_i) >= fixnum_from_obj(r[4]))) { +s_loop_v11401: /* k i r port opc */ + { const fixnum_t v14200_i = fixnum_from_obj(r[1]); + if (((v14200_i) >= fixnum_from_obj(r[4]))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; r[1] = obj_from_ktrap(); @@ -19865,14 +19874,14 @@ s_loop_v11383: /* k i r port opc */ rc = 3; goto jump; } else { - (void)(((v14182_i) == 0) ? ((0) ? obj_from_bool(0) : obj_from_void(0)) : obj_from_void(oportputc((';'), (r[3])))); + (void)(((v14200_i) == 0) ? ((0) ? obj_from_bool(0) : obj_from_void(0)) : obj_from_void(oportputc((';'), (r[3])))); (void)(oportputs(stringchars((r[2])), (r[3]))); /* r[0] */ - r[1] = obj_from_fixnum(fxadd((v14182_i), (+1))); + r[1] = obj_from_fixnum(fxadd((v14200_i), (+1))); /* r[2] */ /* r[3] */ /* r[4] */ - goto s_loop_v11383; + goto s_loop_v11401; } } case 409: /* clo k args l */ @@ -19883,7 +19892,7 @@ case 409: /* clo k args l */ r[1+5] = p[3]; r[1+6] = p[4]; } r += 1; /* shift reg. wnd */ -s_loop_v11366: /* k args l g s f port */ +s_loop_v11384: /* k args l g s f port */ if ((isnull((r[1])))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -19969,11 +19978,11 @@ case 411: /* clo ek . */ /* r[2] */ /* r[3] */ /* r[4] */ - goto s_loop_v11357; + goto s_loop_v11375; -s_loop_v11357: /* k i r port opc */ - { const fixnum_t v14181_i = fixnum_from_obj(r[1]); - if (((v14181_i) >= fixnum_from_obj(r[4]))) { +s_loop_v11375: /* k i r port opc */ + { const fixnum_t v14199_i = fixnum_from_obj(r[1]); + if (((v14199_i) >= fixnum_from_obj(r[4]))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; r[1] = obj_from_ktrap(); @@ -19984,11 +19993,11 @@ s_loop_v11357: /* k i r port opc */ } else { (void)(oportputs(stringchars((r[2])), (r[3]))); /* r[0] */ - r[1] = obj_from_fixnum(fxadd((v14181_i), (+1))); + r[1] = obj_from_fixnum(fxadd((v14199_i), (+1))); /* r[2] */ /* r[3] */ /* r[4] */ - goto s_loop_v11357; + goto s_loop_v11375; } } case 412: /* clo ek . */ @@ -20228,7 +20237,7 @@ case 421: /* clo k args l */ r[1+5] = p[3]; r[1+6] = p[4]; } r += 1; /* shift reg. wnd */ -s_loop_v11288: /* k args l g s f port */ +s_loop_v11306: /* k args l g s f port */ if ((isnull((r[1])))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -20331,19 +20340,19 @@ case 424: /* clo k exp args */ r[9] = (car((r[9]))); r[9] = obj_from_bool(islist((r[9]))); if (bool_from_obj(r[9])) { - { fixnum_t v14180_tmp; - { fixnum_t v14179_tmp; + { fixnum_t v14198_tmp; + { fixnum_t v14197_tmp; { /* length */ int n; obj l = r[2]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14180_tmp = (n); } + v14198_tmp = (n); } r[9] = (cdr((r[1]))); r[9] = (car((r[9]))); { /* length */ int n; obj l = r[9]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14179_tmp = (n); } - r[9] = obj_from_bool((v14180_tmp) == (v14179_tmp)); } } + v14197_tmp = (n); } + r[9] = obj_from_bool((v14198_tmp) == (v14197_tmp)); } } } else { r[9] = obj_from_bool(0); } @@ -20351,13 +20360,13 @@ case 424: /* clo k exp args */ r[9] = obj_from_bool(0); } if (bool_from_obj(r[9])) { - { fixnum_t v14178_tmp; + { fixnum_t v14196_tmp; { /* length */ int n; obj l = r[2]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14178_tmp = (n); } + v14196_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14178_tmp); + obj l, o = mknull(); int c = (v14196_tmp); hreserve(hbsz(3)*c, 9); /* 9 live regs */ l = r[2]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -20384,16 +20393,16 @@ case 424: /* clo k exp args */ r[11+6] = r[4]; r += 11; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v11257; + goto s_loop_v11275; } else { if (bool_from_obj(r[7])) { - { fixnum_t v14177_tmp; + { fixnum_t v14195_tmp; { /* length */ int n; obj l = r[2]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14177_tmp = (n); } + v14195_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14177_tmp); + obj l, o = mknull(); int c = (v14195_tmp); hreserve(hbsz(3)*c, 9); /* 9 live regs */ l = r[2]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -20416,17 +20425,17 @@ case 424: /* clo k exp args */ r[11+7] = r[1]; r += 11; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v11195; + goto s_loop_v11213; } else { (void)(oportputc((36), (r[4]))); (void)(oportputc(('{'), (r[4]))); - { fixnum_t v14176_tmp; + { fixnum_t v14194_tmp; { /* length */ int n; obj l = r[2]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14176_tmp = (n); } + v14194_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14176_tmp); + obj l, o = mknull(); int c = (v14194_tmp); hreserve(hbsz(3)*c, 9); /* 9 live regs */ l = r[2]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -20460,7 +20469,7 @@ case 424: /* clo k exp args */ r[12+7] = r[1]; r += 12; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v11170; + goto s_loop_v11188; } } @@ -20472,7 +20481,7 @@ case 425: /* clo k args l */ r[1+5] = p[3]; r[1+6] = p[4]; } r += 1; /* shift reg. wnd */ -s_loop_v11257: /* k args l g s f port */ +s_loop_v11275: /* k args l g s f port */ if ((isnull((r[1])))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -20656,13 +20665,13 @@ case 430: /* clo ek r */ r[1+11] = p[10]; } r += 1; /* shift reg. wnd */ /* ek r r port args g f exp k k l ids */ - { fixnum_t v14175_tmp; + { fixnum_t v14193_tmp; { /* length */ int n; obj l = (r[11]); for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14175_tmp = (n); } + v14193_tmp = (n); } { /* append */ - obj t, l, o, *p, *d; int c = (v14175_tmp); + obj t, l, o, *p, *d; int c = (v14193_tmp); hreserve(hbsz(3)*c, 12); /* 12 live regs */ l = (r[11]); t = (r[10]); /* gc-safe */ o = t; p = &o; @@ -20690,7 +20699,7 @@ case 430: /* clo ek r */ r[14+4] = r[2]; r += 14; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v11228; + goto s_loop_v11246; case 431: /* clo k ids n */ assert(rc == 4); @@ -20698,7 +20707,7 @@ case 431: /* clo k ids n */ r[1+3] = p[1]; r[1+4] = p[2]; } r += 1; /* shift reg. wnd */ -s_loop_v11228: /* k ids n port r */ +s_loop_v11246: /* k ids n port r */ if ((isnull((r[1])))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -20742,7 +20751,7 @@ s_loop_v11228: /* k ids n port r */ r[7+5] = r[0]; r += 7; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v11230; + goto s_l_v11248; } } @@ -20755,7 +20764,7 @@ case 432: /* clo ek . */ r[1+4] = p[3]; r[1+5] = p[4]; } r += 1; /* shift reg. wnd */ -s_l_v11230: /* ek . loop n ids k */ +s_l_v11248: /* ek . loop n ids k */ r[0] = r[2]; pc = objptr_from_obj(r[0])[0]; r[1] = r[5]; @@ -20781,12 +20790,12 @@ case 433: /* clo ek . */ r += 1; /* shift reg. wnd */ /* ek . port args g r f newl exp k k */ if (bool_from_obj(r[10])) { - { fixnum_t v14174_tmp; + { fixnum_t v14192_tmp; { /* length */ int n; obj l = r[3]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14174_tmp = (n); } - r[11] = obj_from_fixnum(fxadd(fixnum_from_obj(r[10]), (v14174_tmp))); } + v14192_tmp = (n); } + r[11] = obj_from_fixnum(fxadd(fixnum_from_obj(r[10]), (v14192_tmp))); } r[12+0] = r[9]; r[12+1] = r[8]; r[12+2] = r[7]; @@ -20846,7 +20855,7 @@ case 435: /* clo k args l */ r[1+6] = p[4]; r[1+7] = p[5]; } r += 1; /* shift reg. wnd */ -s_loop_v11195: /* k args l port g s f exp */ +s_loop_v11213: /* k args l port g s f exp */ if ((isnull((r[1])))) { r[8+0] = r[0]; r[8+1] = r[7]; @@ -20965,7 +20974,7 @@ case 439: /* clo k args l */ r[1+6] = p[4]; r[1+7] = p[5]; } r += 1; /* shift reg. wnd */ -s_loop_v11170: /* k args l port g s f exp */ +s_loop_v11188: /* k args l port g s f exp */ if ((isnull((r[1])))) { r[8+0] = r[0]; r[8+1] = r[7]; @@ -21104,7 +21113,7 @@ case 444: /* clo k tail */ r[3+0] = (cx_c_2Derror); pc = objptr_from_obj(r[3+0])[0]; r[3+1] = r[0]; - r[3+2] = (cx__232062); + r[3+2] = (cx__232065); r[3+3] = r[2]; r += 3; /* shift reg wnd */ rreserve(MAX_HOSTREGS); @@ -21325,17 +21334,17 @@ gs_display_2Dcode: /* k cstr oport */ r[3+4] = r[2]; r += 3; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v11069; + goto s_loop_v11087; -s_loop_v11069: /* k i l cstr oport */ - { const fixnum_t v14173_i = fixnum_from_obj(r[1]); - if (((fxsub(fixnum_from_obj(r[2]), (v14173_i))) <= (+70))) { - (void)(oportputcircular((cx__233024), (r[4]), 1)); +s_loop_v11087: /* k i l cstr oport */ + { const fixnum_t v14191_i = fixnum_from_obj(r[1]); + if (((fxsub(fixnum_from_obj(r[2]), (v14191_i))) <= (+70))) { + (void)(oportputcircular((cx__233027), (r[4]), 1)); { /* substring */ - int *d = substring(stringdata((r[3])), (v14173_i), fixnum_from_obj(r[2])); + int *d = substring(stringdata((r[3])), (v14191_i), fixnum_from_obj(r[2])); r[5] = (hpushstr(5, d)); } (void)(oportputcircular((r[5]), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); - r[5] = obj_from_void(oportputcircular((cx__233028), (r[4]), 1)); + r[5] = obj_from_void(oportputcircular((cx__233031), (r[4]), 1)); /* r[0] */ pc = objptr_from_obj(r[0])[0]; r[1] = obj_from_ktrap(); @@ -21344,18 +21353,18 @@ s_loop_v11069: /* k i l cstr oport */ rc = 3; goto jump; } else { - (void)(oportputcircular((cx__233024), (r[4]), 1)); + (void)(oportputcircular((cx__233027), (r[4]), 1)); { /* substring */ - int *d = substring(stringdata((r[3])), (v14173_i), (fxadd((v14173_i), (+70)))); + int *d = substring(stringdata((r[3])), (v14191_i), (fxadd((v14191_i), (+70)))); r[5] = (hpushstr(5, d)); } (void)(oportputcircular((r[5]), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); - (void)(oportputcircular((cx__233019), (r[4]), 1)); + (void)(oportputcircular((cx__233022), (r[4]), 1)); /* r[0] */ - r[1] = obj_from_fixnum(fxadd((v14173_i), (+70))); + r[1] = obj_from_fixnum(fxadd((v14191_i), (+70))); /* r[2] */ /* r[3] */ /* r[4] */ - goto s_loop_v11069; + goto s_loop_v11087; } } case 456: /* process-syntax k id xval oport */ @@ -21363,9 +21372,9 @@ case 456: /* process-syntax k id xval oport */ r += 1; /* shift reg. wnd */ /* k id xval oport */ (void)(oportputc('\n', (r[3]))); - (void)(oportputcircular((cx__233053), (r[3]), 1)); + (void)(oportputcircular((cx__233056), (r[3]), 1)); (void)(oportputcircular((r[1]), (r[3]), 1)); - (void)(oportputcircular((cx__233052), (r[3]), 1)); + (void)(oportputcircular((cx__233055), (r[3]), 1)); { /* open-output-string */ r[4] = (mkoport_string(4, newcb())); } hreserve(hbsz(3+1), 5); /* 5 live regs */ @@ -21425,12 +21434,12 @@ case 459: /* process-alias k id oldid oport */ r += 1; /* shift reg. wnd */ /* k id oldid oport */ (void)(oportputc('\n', (r[3]))); - (void)(oportputcircular((cx__233063), (r[3]), 1)); + (void)(oportputcircular((cx__233066), (r[3]), 1)); (void)(oportputcircular((r[1]), (r[3]), 1)); - (void)(oportputcircular((cx__233028), (r[3]), 1)); - (void)(oportputcircular((cx__233062), (r[3]), 1)); + (void)(oportputcircular((cx__233031), (r[3]), 1)); + (void)(oportputcircular((cx__233065), (r[3]), 1)); (void)(oportputcircular((r[2]), (r[3]), 1)); - r[4] = obj_from_void(oportputcircular((cx__233052), (r[3]), 1)); + r[4] = obj_from_void(oportputcircular((cx__233055), (r[3]), 1)); r[5+0] = r[0]; pc = objptr_from_obj(r[5+0])[0]; r[5+1] = obj_from_ktrap(); @@ -21509,7 +21518,7 @@ case 462: /* clo ek . */ r[6] = (hpushstr(6, newstring(cbdata(pcb)))); } } (void)(objptr_from_obj(r[4])[0] = (r[6])); (void)(oportputc('\n', (r[3]))); - (void)(oportputcircular((cx__233074), (r[3]), 1)); + (void)(oportputcircular((cx__233077), (r[3]), 1)); hreserve(hbsz(2+1), 7); /* 7 live regs */ *--hp = r[3]; *--hp = r[2]; @@ -21610,32 +21619,32 @@ case 466: /* clo ek . */ else { cbuf_t *pcb = oportdata(o); r[8] = (hpushstr(8, newstring(cbdata(pcb)))); } } (void)(objptr_from_obj(r[6])[0] = (r[8])); - { fixnum_t v14168_len; + { fixnum_t v14186_len; r[9] = (objptr_from_obj(r[6])[0]); - v14168_len = (stringlen((r[9]))); + v14186_len = (stringlen((r[9]))); r[9] = (car((r[5]))); r[9] = obj_from_bool((r[9]) == (mksymbol(internsym("lambda")))); if (bool_from_obj(r[9])) { - if (((v14168_len) > (+4))) { - { char_t v14172_tmp; + if (((v14186_len) > (+4))) { + { char_t v14190_tmp; r[9] = (objptr_from_obj(r[6])[0]); - v14172_tmp = (*(unsigned char*)stringref((r[9]), (+0))); - r[9] = obj_from_bool((v14172_tmp) == ('&')); } + v14190_tmp = (*(unsigned char*)stringref((r[9]), (+0))); + r[9] = obj_from_bool((v14190_tmp) == ('&')); } if (bool_from_obj(r[9])) { - { char_t v14171_tmp; + { char_t v14189_tmp; r[9] = (objptr_from_obj(r[6])[0]); - v14171_tmp = (*(unsigned char*)stringref((r[9]), (+1))); - r[9] = obj_from_bool((v14171_tmp) == ('0')); } + v14189_tmp = (*(unsigned char*)stringref((r[9]), (+1))); + r[9] = obj_from_bool((v14189_tmp) == ('0')); } if (bool_from_obj(r[9])) { - { char_t v14170_tmp; + { char_t v14188_tmp; r[9] = (objptr_from_obj(r[6])[0]); - v14170_tmp = (*(unsigned char*)stringref((r[9]), (+2))); - r[9] = obj_from_bool((v14170_tmp) == ('{')); } + v14188_tmp = (*(unsigned char*)stringref((r[9]), (+2))); + r[9] = obj_from_bool((v14188_tmp) == ('{')); } if (bool_from_obj(r[9])) { - { char_t v14169_tmp; + { char_t v14187_tmp; r[9] = (objptr_from_obj(r[6])[0]); - v14169_tmp = (*(unsigned char*)stringref((r[9]), (fxsub((v14168_len), (+1))))); - r[9] = obj_from_bool((v14169_tmp) == ('}')); } + v14187_tmp = (*(unsigned char*)stringref((r[9]), (fxsub((v14186_len), (+1))))); + r[9] = obj_from_bool((v14187_tmp) == ('}')); } } else { r[9] = obj_from_bool(0); } @@ -21653,9 +21662,9 @@ case 466: /* clo ek . */ } if (bool_from_obj(r[9])) { (void)(oportputc('\n', (r[4]))); - (void)(oportputcircular((cx__233097), (r[4]), 1)); + (void)(oportputcircular((cx__233100), (r[4]), 1)); (void)(oportputcircular((r[3]), (r[4]), 1)); - (void)(oportputcircular((cx__233052), (r[4]), 1)); + (void)(oportputcircular((cx__233055), (r[4]), 1)); hreserve(hbsz(2+1), 9); /* 9 live regs */ *--hp = r[4]; *--hp = r[2]; @@ -21663,7 +21672,7 @@ case 466: /* clo ek . */ r[9] = (hendblk(2+1)); r[10] = (objptr_from_obj(r[6])[0]); { /* substring */ - int *d = substring(stringdata((r[10])), (+3), (fxsub((v14168_len), (+1)))); + int *d = substring(stringdata((r[10])), (+3), (fxsub((v14186_len), (+1)))); r[10] = (hpushstr(11, d)); } r[0] = r[9]; r[1] = (r[10]); @@ -21770,7 +21779,7 @@ case 469: /* clo ek . */ r[6] = (hpushstr(6, newstring(cbdata(pcb)))); } } (void)(objptr_from_obj(r[4])[0] = (r[6])); (void)(oportputc('\n', (r[3]))); - (void)(oportputcircular((cx__233074), (r[3]), 1)); + (void)(oportputcircular((cx__233077), (r[3]), 1)); hreserve(hbsz(2+1), 7); /* 7 live regs */ *--hp = r[3]; *--hp = r[2]; @@ -21817,7 +21826,7 @@ gs_scan_2Dtop_2Dform: /* k x */ if (bool_from_obj(r[2])) { r[2] = (cdr((r[1]))); r[2] = (car((r[2]))); - r[3] = ((obj)fopen(stringchars((r[2])), stringchars((cx__233166)))); + r[3] = ((obj)fopen(stringchars((r[2])), stringchars((cx__233169)))); hreserve(hbsz(1+1), 4); /* 4 live regs */ *--hp = r[0]; *--hp = obj_from_case(472); @@ -21829,12 +21838,12 @@ gs_scan_2Dtop_2Dform: /* k x */ r[6+2] = r[0]; r += 6; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v10925; + goto s_l_v10943; } else { r[5+0] = (cx_file_2Derror); pc = objptr_from_obj(r[5+0])[0]; r[5+1] = r[4]; - r[5+2] = (cx__233170); + r[5+2] = (cx__233173); r[5+3] = r[2]; r += 5; /* shift reg wnd */ rreserve(MAX_HOSTREGS); @@ -21874,7 +21883,7 @@ case 472: /* clo ek r */ { obj* p = objptr_from_obj(r[0]); r[1+2] = p[1]; } r += 1; /* shift reg. wnd */ -s_l_v10925: /* ek r k */ +s_l_v10943: /* ek r k */ hreserve(hbsz(2+1), 3); /* 3 live regs */ *--hp = r[2]; *--hp = r[1]; @@ -21905,14 +21914,14 @@ case 473: /* clo ek r */ r[0] = r[4]; /* r[1] */ /* r[2] */ - goto s_loop_v10934; + goto s_loop_v10952; case 474: /* clo k x */ assert(rc == 3); { obj* p = objptr_from_obj(r[0]); r[1+2] = p[1]; } r += 1; /* shift reg. wnd */ -s_loop_v10934: /* k x r */ +s_loop_v10952: /* k x r */ if ((iseof((r[1])))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -22003,7 +22012,7 @@ case 478: /* clo ek r */ r[4] = (cdr((r[2]))); r[0] = r[3]; r[1] = r[4]; - goto s_loop_v10909; + goto s_loop_v10927; } else { if (((r[1]) == (mksymbol(internsym("define-syntax"))))) { hreserve(hbsz(2+1), 4); /* 4 live regs */ @@ -22052,7 +22061,7 @@ case 478: /* clo ek r */ case 479: /* clo k l */ assert(rc == 3); r += 1; /* shift reg. wnd */ -s_loop_v10909: /* k l */ +s_loop_v10927: /* k l */ if ((ispair((r[1])))) { hreserve(hbsz(0+1), 2); /* 2 live regs */ *--hp = obj_from_case(479); @@ -22158,7 +22167,7 @@ gs_process_2Dtop_2Dform: /* k x oport */ if (bool_from_obj(r[3])) { r[3] = (cdr((r[1]))); r[3] = (car((r[3]))); - r[4] = ((obj)fopen(stringchars((r[3])), stringchars((cx__233166)))); + r[4] = ((obj)fopen(stringchars((r[3])), stringchars((cx__233169)))); hreserve(hbsz(1+1), 5); /* 5 live regs */ *--hp = r[0]; *--hp = obj_from_case(485); @@ -22170,12 +22179,12 @@ gs_process_2Dtop_2Dform: /* k x oport */ r[7+2] = r[0]; r += 7; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v10847; + goto s_l_v10865; } else { r[0] = (cx_file_2Derror); pc = objptr_from_obj(r[0])[0]; r[1] = r[5]; - r[2] = (cx__233170); + r[2] = (cx__233173); /* r[3] */ rreserve(MAX_HOSTREGS); rc = 4; @@ -22221,7 +22230,7 @@ case 485: /* clo ek r */ { obj* p = objptr_from_obj(r[0]); r[1+2] = p[1]; } r += 1; /* shift reg. wnd */ -s_l_v10847: /* ek r k */ +s_l_v10865: /* ek r k */ hreserve(hbsz(2+1), 3); /* 3 live regs */ *--hp = r[2]; *--hp = r[1]; @@ -22252,14 +22261,14 @@ case 486: /* clo ek r */ r[0] = r[4]; /* r[1] */ /* r[2] */ - goto s_loop_v10856; + goto s_loop_v10874; case 487: /* clo k x */ assert(rc == 3); { obj* p = objptr_from_obj(r[0]); r[1+2] = p[1]; } r += 1; /* shift reg. wnd */ -s_loop_v10856: /* k x r */ +s_loop_v10874: /* k x r */ if ((iseof((r[1])))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -22352,7 +22361,7 @@ case 491: /* clo ek r */ r[0] = r[4]; r[1] = r[5]; /* r[2] */ - goto s_loop_v10831; + goto s_loop_v10849; } else { if (((r[1]) == (mksymbol(internsym("define-syntax"))))) { hreserve(hbsz(3+1), 5); /* 5 live regs */ @@ -22430,7 +22439,7 @@ case 492: /* clo k x* */ { obj* p = objptr_from_obj(r[0]); r[1+2] = p[1]; } r += 1; /* shift reg. wnd */ -s_loop_v10831: /* k x* oport */ +s_loop_v10849: /* k x* oport */ if ((ispair((r[1])))) { hreserve(hbsz(1+1), 3); /* 3 live regs */ *--hp = r[2]; @@ -22530,12 +22539,12 @@ case 495: /* clo ek r */ r[7] = (cdr((r[7]))); r[7] = (car((r[7]))); (void)(oportputc('\n', (r[2]))); - (void)(oportputcircular((cx__233063), (r[2]), 1)); + (void)(oportputcircular((cx__233066), (r[2]), 1)); (void)(oportputcircular((r[6]), (r[2]), 1)); - (void)(oportputcircular((cx__233028), (r[2]), 1)); - (void)(oportputcircular((cx__233062), (r[2]), 1)); + (void)(oportputcircular((cx__233031), (r[2]), 1)); + (void)(oportputcircular((cx__233065), (r[2]), 1)); (void)(oportputcircular((r[7]), (r[2]), 1)); - r[6] = obj_from_void(oportputcircular((cx__233052), (r[2]), 1)); + r[6] = obj_from_void(oportputcircular((cx__233055), (r[2]), 1)); r[0] = r[3]; pc = objptr_from_obj(r[0])[0]; r[1] = obj_from_ktrap(); @@ -22550,9 +22559,9 @@ case 495: /* clo ek r */ r[7] = (cdr((r[7]))); r[7] = (car((r[7]))); (void)(oportputc('\n', (r[2]))); - (void)(oportputcircular((cx__233053), (r[2]), 1)); + (void)(oportputcircular((cx__233056), (r[2]), 1)); (void)(oportputcircular((r[6]), (r[2]), 1)); - (void)(oportputcircular((cx__233052), (r[2]), 1)); + (void)(oportputcircular((cx__233055), (r[2]), 1)); { /* open-output-string */ r[8] = (mkoport_string(8, newcb())); } hreserve(hbsz(3+1), 9); /* 9 live regs */ @@ -22711,7 +22720,7 @@ case 502: /* clo ek . */ r[6] = (hpushstr(6, newstring(cbdata(pcb)))); } } (void)(objptr_from_obj(r[4])[0] = (r[6])); (void)(oportputc('\n', (r[3]))); - (void)(oportputcircular((cx__233074), (r[3]), 1)); + (void)(oportputcircular((cx__233077), (r[3]), 1)); hreserve(hbsz(2+1), 7); /* 7 live regs */ *--hp = r[3]; *--hp = r[2]; @@ -22810,7 +22819,7 @@ case 506: /* clo ek . */ r[6] = (hpushstr(6, newstring(cbdata(pcb)))); } } (void)(objptr_from_obj(r[4])[0] = (r[6])); (void)(oportputc('\n', (r[3]))); - (void)(oportputcircular((cx__233074), (r[3]), 1)); + (void)(oportputcircular((cx__233077), (r[3]), 1)); hreserve(hbsz(2+1), 7); /* 7 live regs */ *--hp = r[3]; *--hp = r[2]; @@ -22849,13 +22858,13 @@ gs_path_2Dstrip_2Ddirectory: /* k filename */ while (c-- > 0) { *--hp = l; *--hp = obj_from_char(s[c]); *--hp = obj_from_size(PAIR_BTAG); l = hendblk(3); } r[2] = (l); } - { fixnum_t v14167_tmp; + { fixnum_t v14185_tmp; { /* length */ int n; obj l = r[2]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14167_tmp = (n); } + v14185_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14167_tmp); + obj l, o = mknull(); int c = (v14185_tmp); hreserve(hbsz(3)*c, 3); /* 3 live regs */ l = r[2]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -22864,17 +22873,17 @@ gs_path_2Dstrip_2Ddirectory: /* k filename */ /* r[0] */ r[1] = r[2]; r[2] = (mknull()); - goto s_loop_v10732; + goto s_loop_v10750; -s_loop_v10732: /* k l r */ +s_loop_v10750: /* k l r */ if ((isnull((r[1])))) { - { fixnum_t v14166_tmp; + { fixnum_t v14184_tmp; { /* length */ int n; obj l = r[2]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14166_tmp = (n); } + v14184_tmp = (n); } { /* list->string */ - int i, c = (v14166_tmp); + int i, c = (v14184_tmp); obj o = hpushstr(3, allocstring(c, ' ')); /* 3 live regs */ obj l = r[2]; /* gc-safe */ unsigned char *s = (unsigned char *)stringchars(o); @@ -22889,15 +22898,15 @@ s_loop_v10732: /* k l r */ goto jump; } else { r[3] = (car((r[1]))); - r[3] = (ismemv((r[3]), (cx__233292))); + r[3] = (ismemv((r[3]), (cx__233295))); if (bool_from_obj(r[3])) { - { fixnum_t v14165_tmp; + { fixnum_t v14183_tmp; { /* length */ int n; obj l = r[2]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14165_tmp = (n); } + v14183_tmp = (n); } { /* list->string */ - int i, c = (v14165_tmp); + int i, c = (v14183_tmp); obj o = hpushstr(3, allocstring(c, ' ')); /* 3 live regs */ obj l = r[2]; /* gc-safe */ unsigned char *s = (unsigned char *)stringchars(o); @@ -22922,7 +22931,7 @@ s_loop_v10732: /* k l r */ /* r[0] */ r[1] = r[3]; r[2] = r[4]; - goto s_loop_v10732; + goto s_loop_v10750; } } @@ -22938,13 +22947,13 @@ gs_path_2Dstrip_2Dextension: /* k filename */ while (c-- > 0) { *--hp = l; *--hp = obj_from_char(s[c]); *--hp = obj_from_size(PAIR_BTAG); l = hendblk(3); } r[2] = (l); } - { fixnum_t v14162_tmp; + { fixnum_t v14180_tmp; { /* length */ int n; obj l = r[2]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14162_tmp = (n); } + v14180_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14162_tmp); + obj l, o = mknull(); int c = (v14180_tmp); hreserve(hbsz(3)*c, 3); /* 3 live regs */ l = r[2]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); @@ -22953,25 +22962,25 @@ gs_path_2Dstrip_2Dextension: /* k filename */ r[3] = (ismemv(obj_from_char('.'), (r[2]))); if (bool_from_obj(r[3])) { r[4] = (cdr((r[3]))); - { fixnum_t v14163_tmp; + { fixnum_t v14181_tmp; { /* length */ int n; obj l = r[4]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14163_tmp = (n); } + v14181_tmp = (n); } { /* reverse */ - obj l, o = mknull(); int c = (v14163_tmp); + obj l, o = mknull(); int c = (v14181_tmp); hreserve(hbsz(3)*c, 5); /* 5 live regs */ l = r[4]; /* gc-safe */ for (; l != mknull(); l = cdr(l)) { *--hp = o; *--hp = car(l); *--hp = obj_from_size(PAIR_BTAG); o = hendblk(3); } r[4] = (o); } } - { fixnum_t v14164_tmp; + { fixnum_t v14182_tmp; { /* length */ int n; obj l = r[4]; for (n = 0; l != mknull(); ++n, l = cdr(l)) ; - v14164_tmp = (n); } + v14182_tmp = (n); } { /* list->string */ - int i, c = (v14164_tmp); + int i, c = (v14182_tmp); obj o = hpushstr(5, allocstring(c, ' ')); /* 5 live regs */ obj l = r[4]; /* gc-safe */ unsigned char *s = (unsigned char *)stringchars(o); @@ -23044,7 +23053,7 @@ case 513: /* clo ek r */ r[1+6] = p[5]; } r += 1; /* shift reg. wnd */ /* ek r k oport mname iport fname */ - r[7] = ((obj)fopen(stringchars((r[6])), stringchars((cx__233166)))); + r[7] = ((obj)fopen(stringchars((r[6])), stringchars((cx__233169)))); hreserve(hbsz(6+1), 8); /* 8 live regs */ *--hp = r[5]; *--hp = r[1]; @@ -23066,12 +23075,12 @@ case 513: /* clo ek r */ r[10+7] = r[5]; r += 10; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v10664; + goto s_l_v10682; } else { r[0] = (cx_file_2Derror); pc = objptr_from_obj(r[0])[0]; r[1] = r[8]; - r[2] = (cx__233170); + r[2] = (cx__233173); r[3] = r[6]; rreserve(MAX_HOSTREGS); rc = 4; @@ -23088,13 +23097,13 @@ case 514: /* clo ek r */ r[1+6] = p[5]; r[1+7] = p[6]; } r += 1; /* shift reg. wnd */ -s_l_v10664: /* ek r fname k oport mname r iport */ +s_l_v10682: /* ek r fname k oport mname r iport */ (void)(objptr_from_obj(r[7])[0] = (r[1])); (void)(objptr_from_obj(r[5])[0] = (r[6])); - (void)(oportputcircular((cx__233346), (r[4]), 1)); + (void)(oportputcircular((cx__233349), (r[4]), 1)); r[8] = (objptr_from_obj(r[5])[0]); (void)(oportputcircular((r[8]), (r[4]), 1)); - (void)(oportputcircular((cx__233345), (r[4]), 1)); + (void)(oportputcircular((cx__233348), (r[4]), 1)); hreserve(hbsz(4+1), 8); /* 8 live regs */ *--hp = r[4]; *--hp = r[5]; @@ -23116,13 +23125,13 @@ case 515: /* clo ek r */ r += 1; /* shift reg. wnd */ /* ek r iport k mname oport */ (void)(oportputcircular((r[1]), (r[5]), 1)); - (void)(oportputcircular((cx__233344), (r[5]), 1)); + (void)(oportputcircular((cx__233347), (r[5]), 1)); (void)(oportputc('\n', (r[5]))); (void)(oportputc('\n', (r[5]))); - (void)(oportputcircular((cx__233343), (r[5]), 1)); + (void)(oportputcircular((cx__233346), (r[5]), 1)); r[6] = (objptr_from_obj(r[4])[0]); (void)(oportputcircular((r[6]), (r[5]), 1)); - (void)(oportputcircular((cx__233342), (r[5]), 1)); + (void)(oportputcircular((cx__233345), (r[5]), 1)); (void)(oportputc('\n', (r[5]))); hreserve(hbsz(3+1), 6); /* 6 live regs */ *--hp = r[5]; @@ -23159,7 +23168,7 @@ case 516: /* clo ek r */ r[6+3] = r[2]; r += 6; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_loop_v10675; + goto s_loop_v10693; case 517: /* clo k x */ assert(rc == 3); @@ -23167,7 +23176,7 @@ case 517: /* clo k x */ r[1+2] = p[1]; r[1+3] = p[2]; } r += 1; /* shift reg. wnd */ -s_loop_v10675: /* k x oport iport */ +s_loop_v10693: /* k x oport iport */ if ((iseof((r[1])))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -23242,7 +23251,7 @@ case 520: /* clo ek . */ r[1+4] = p[3]; } r += 1; /* shift reg. wnd */ /* ek . iport k oport */ - (void)(oportputcircular((cx__233334), (r[4]), 1)); + (void)(oportputcircular((cx__233337), (r[4]), 1)); r[0] = (cx_close_2Dinput_2Dport); pc = objptr_from_obj(r[0])[0]; r[1] = r[3]; @@ -23317,11 +23326,11 @@ case 524: /* clo ek . */ r[2] = obj_from_void(0); /* ignored */ r += 1; /* shift reg. wnd */ /* ek . */ - cx_test1 = (cx__233373); - cx_test2 = (cx__233643); - cx_test3 = (cx__233845); - cx_test4 = (cx__234247); - cx_test5 = (cx__234377); + cx_test1 = (cx__233376); + cx_test2 = (cx__233646); + cx_test3 = (cx__233848); + cx_test4 = (cx__234250); + cx_test5 = (cx__234380); cx__2Averbose_2A = obj_from_bool(0); cx__2Areset_2A = obj_from_bool(0); { static obj c[] = { obj_from_case(525) }; cx_error_2A = (obj)c; } @@ -23357,7 +23366,7 @@ gs_error_2A: /* k msg args */ r[0] = r[4]; r[1] = r[2]; r[2] = r[3]; - goto s_loop_v10632; + goto s_loop_v10650; } else { { /* cons */ hreserve(hbsz(3), 3); /* 3 live regs */ @@ -23376,7 +23385,7 @@ gs_error_2A: /* k msg args */ goto jump; } -s_loop_v10632: /* k l p */ +s_loop_v10650: /* k l p */ if ((ispair((r[1])))) { r[3] = (car((r[1]))); (void)(oportputcircular((r[3]), (r[2]), 0)); @@ -23385,7 +23394,7 @@ s_loop_v10632: /* k l p */ /* r[0] */ r[1] = r[3]; /* r[2] */ - goto s_loop_v10632; + goto s_loop_v10650; } else { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -23420,7 +23429,7 @@ gs_run_2Dtests: /* k */ r[1] = (hendblk(1)); r[2] = obj_from_flonum(2, clock()); (void)(objptr_from_obj(r[1])[0] = (r[2])); - (void)(oportputcircular((cx__234810), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); + (void)(oportputcircular((cx__234813), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A))); hreserve(hbsz(2+1), 2); /* 2 live regs */ *--hp = r[1]; @@ -23512,23 +23521,23 @@ case 532: /* clo ek r */ /* ek r k start */ (void)(oportputcircular((r[1]), (cx__2Acurrent_2Doutput_2Dport_2A), 0)); (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A))); - (void)(oportputcircular((cx__234809), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); - { flonum_t v14160_b; - { flonum_t v14159_a; - { const flonum_t v14158_b = (CLOCKS_PER_SEC); - { const flonum_t v14156_a = (clock()); + (void)(oportputcircular((cx__234812), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); + { flonum_t v14178_b; + { flonum_t v14177_a; + { const flonum_t v14176_b = (CLOCKS_PER_SEC); + { const flonum_t v14174_a = (clock()); r[4] = (objptr_from_obj(r[3])[0]); if ((is_fixnum_obj(r[4]))) { - { const flonum_t v14157_tmp = ((flonum_t)fixnum_from_obj(r[4])); - v14159_a = ((v14156_a) - (v14157_tmp)); } + { const flonum_t v14175_tmp = ((flonum_t)fixnum_from_obj(r[4])); + v14177_a = ((v14174_a) - (v14175_tmp)); } } else { - v14159_a = ((v14156_a) - flonum_from_obj(r[4])); + v14177_a = ((v14174_a) - flonum_from_obj(r[4])); } } - v14160_b = ((v14159_a) / (v14158_b)); } } - { const flonum_t v14161_tmp = ((flonum_t)(+1000)); - r[4] = obj_from_flonum(4, (v14161_tmp) * (v14160_b)); } } + v14178_b = ((v14177_a) / (v14176_b)); } } + { const flonum_t v14179_tmp = ((flonum_t)(+1000)); + r[4] = obj_from_flonum(4, (v14179_tmp) * (v14178_b)); } } (void)(oportputcircular((r[4]), (cx__2Acurrent_2Doutput_2Dport_2A), 0)); - (void)(oportputcircular((cx__234785), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); + (void)(oportputcircular((cx__234788), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); r[4] = obj_from_void(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A))); r[0] = r[2]; pc = objptr_from_obj(r[0])[0]; @@ -23564,7 +23573,7 @@ case 534: /* clo ek r */ r += 1; /* shift reg. wnd */ /* ek r k */ if (bool_from_obj(cx__2Averbose_2A)) { - (void)(oportputcircular((cx__234882), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); + (void)(oportputcircular((cx__234885), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A))); (void)(oportputcircular((r[1]), (cx__2Acurrent_2Doutput_2Dport_2A), 0)); (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A))); @@ -23582,12 +23591,12 @@ case 534: /* clo ek r */ r[4+3] = r[1]; r += 4; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v10553; + goto s_l_v10571; } else { r[4+0] = (cx_x_2Derror); pc = objptr_from_obj(r[4+0])[0]; r[4+1] = r[3]; - r[4+2] = (cx__234880); + r[4+2] = (cx__234883); r[4+3] = r[1]; r += 4; /* shift reg wnd */ rreserve(MAX_HOSTREGS); @@ -23602,7 +23611,7 @@ case 535: /* clo ek . */ r[1+2] = p[1]; r[1+3] = p[2]; } r += 1; /* shift reg. wnd */ -s_l_v10553: /* ek . k r */ +s_l_v10571: /* ek . k r */ r[4] = (car((r[3]))); r[4] = obj_from_bool((r[4]) == (mksymbol(internsym("define")))); if (bool_from_obj(r[4])) { @@ -23610,7 +23619,7 @@ s_l_v10553: /* ek . k r */ } else { } if (bool_from_obj(cx__2Averbose_2A)) { - (void)(oportputcircular((cx__234873), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); + (void)(oportputcircular((cx__234876), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A))); } else { } @@ -23672,7 +23681,7 @@ case 537: /* clo ek . */ if (bool_from_obj(cx__2Averbose_2A)) { (void)(oportputcircular((r[4]), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A))); - (void)(oportputcircular((cx__234866), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); + (void)(oportputcircular((cx__234869), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A))); r[6] = obj_from_flonum(6, clock()); (void)(objptr_from_obj(r[5])[0] = (r[6])); @@ -23724,23 +23733,23 @@ case 539: /* clo ek r */ (void)(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A))); } if (bool_from_obj(cx__2Averbose_2A)) { - (void)(oportputcircular((cx__234809), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); - { flonum_t v14154_b; - { flonum_t v14153_a; - { const flonum_t v14152_b = (CLOCKS_PER_SEC); - { const flonum_t v14150_a = (clock()); + (void)(oportputcircular((cx__234812), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); + { flonum_t v14172_b; + { flonum_t v14171_a; + { const flonum_t v14170_b = (CLOCKS_PER_SEC); + { const flonum_t v14168_a = (clock()); r[4] = (objptr_from_obj(r[3])[0]); if ((is_fixnum_obj(r[4]))) { - { const flonum_t v14151_tmp = ((flonum_t)fixnum_from_obj(r[4])); - v14153_a = ((v14150_a) - (v14151_tmp)); } + { const flonum_t v14169_tmp = ((flonum_t)fixnum_from_obj(r[4])); + v14171_a = ((v14168_a) - (v14169_tmp)); } } else { - v14153_a = ((v14150_a) - flonum_from_obj(r[4])); + v14171_a = ((v14168_a) - flonum_from_obj(r[4])); } } - v14154_b = ((v14153_a) / (v14152_b)); } } - { const flonum_t v14155_tmp = ((flonum_t)(+1000)); - r[4] = obj_from_flonum(4, (v14155_tmp) * (v14154_b)); } } + v14172_b = ((v14171_a) / (v14170_b)); } } + { const flonum_t v14173_tmp = ((flonum_t)(+1000)); + r[4] = obj_from_flonum(4, (v14173_tmp) * (v14172_b)); } } (void)(oportputcircular((r[4]), (cx__2Acurrent_2Doutput_2Dport_2A), 0)); - (void)(oportputcircular((cx__234785), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); + (void)(oportputcircular((cx__234788), (cx__2Acurrent_2Doutput_2Dport_2A), 1)); r[4] = obj_from_void(oportputc('\n', (cx__2Acurrent_2Doutput_2Dport_2A))); } else { r[4] = obj_from_void(0); @@ -23773,7 +23782,7 @@ gs_repl_2Deval_2Dtop_2Dform: /* k x */ if (bool_from_obj(r[2])) { r[2] = (cdr((r[1]))); r[2] = (car((r[2]))); - r[3] = ((obj)fopen(stringchars((r[2])), stringchars((cx__233166)))); + r[3] = ((obj)fopen(stringchars((r[2])), stringchars((cx__233169)))); hreserve(hbsz(1+1), 4); /* 4 live regs */ *--hp = r[0]; *--hp = obj_from_case(541); @@ -23785,12 +23794,12 @@ gs_repl_2Deval_2Dtop_2Dform: /* k x */ r[6+2] = r[0]; r += 6; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v10533; + goto s_l_v10551; } else { r[5+0] = (cx_file_2Derror); pc = objptr_from_obj(r[5+0])[0]; r[5+1] = r[4]; - r[5+2] = (cx__233170); + r[5+2] = (cx__233173); r[5+3] = r[2]; r += 5; /* shift reg wnd */ rreserve(MAX_HOSTREGS); @@ -23825,7 +23834,7 @@ case 541: /* clo ek r */ { obj* p = objptr_from_obj(r[0]); r[1+2] = p[1]; } r += 1; /* shift reg. wnd */ -s_l_v10533: /* ek r k */ +s_l_v10551: /* ek r k */ hreserve(hbsz(2+1), 3); /* 3 live regs */ *--hp = r[2]; *--hp = r[1]; @@ -23862,7 +23871,7 @@ case 543: /* clo ek r */ r[4] = (cdr((r[2]))); r[0] = r[3]; r[1] = r[4]; - goto s_loop_v10517; + goto s_loop_v10535; } else { if (((r[1]) == (mksymbol(internsym("define-syntax"))))) { hreserve(hbsz(2+1), 4); /* 4 live regs */ @@ -23907,7 +23916,7 @@ case 543: /* clo ek r */ case 544: /* clo k x* */ assert(rc == 3); r += 1; /* shift reg. wnd */ -s_loop_v10517: /* k x* */ +s_loop_v10535: /* k x* */ if ((ispair((r[1])))) { hreserve(hbsz(0+1), 2); /* 2 live regs */ *--hp = obj_from_case(544); @@ -23997,7 +24006,7 @@ case 549: /* repl-read k iport */ assert(rc == 3); r += 1; /* shift reg. wnd */ gs_repl_2Dread: /* k iport */ - (void)(((r[1]) == (cx__2Acurrent_2Dinput_2Dport_2A)) ? (void)(oportputcircular((cx__234938), (cx__2Acurrent_2Doutput_2Dport_2A), 1)) : (void)(0)); + (void)(((r[1]) == (cx__2Acurrent_2Dinput_2Dport_2A)) ? (void)(oportputcircular((cx__234941), (cx__2Acurrent_2Doutput_2Dport_2A), 1)) : (void)(0)); r[2+0] = (cx__25read); pc = objptr_from_obj(r[2+0])[0]; r[2+1] = r[0]; @@ -24031,14 +24040,14 @@ case 551: /* clo ek r */ r[0] = r[3]; /* r[1] */ /* r[2] */ - goto s_loop_v10464; + goto s_loop_v10482; case 552: /* clo k x */ assert(rc == 3); { obj* p = objptr_from_obj(r[0]); r[1+2] = p[1]; } r += 1; /* shift reg. wnd */ -s_loop_v10464: /* k x iport */ +s_loop_v10482: /* k x iport */ if ((iseof((r[1])))) { /* r[0] */ pc = objptr_from_obj(r[0])[0]; @@ -24104,7 +24113,7 @@ gs_repl_2Dfile: /* k fname */ hreserve(hbsz(1), 2); /* 2 live regs */ *--hp = obj_from_void(0); r[2] = (hendblk(1)); - r[3] = ((obj)fopen(stringchars((r[1])), stringchars((cx__233166)))); + r[3] = ((obj)fopen(stringchars((r[1])), stringchars((cx__233169)))); hreserve(hbsz(2+1), 4); /* 4 live regs */ *--hp = r[2]; *--hp = r[0]; @@ -24118,12 +24127,12 @@ gs_repl_2Dfile: /* k fname */ r[6+3] = r[2]; r += 6; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v10445; + goto s_l_v10463; } else { r[5+0] = (cx_file_2Derror); pc = objptr_from_obj(r[5+0])[0]; r[5+1] = r[4]; - r[5+2] = (cx__233170); + r[5+2] = (cx__233173); r[5+3] = r[1]; r += 5; /* shift reg wnd */ rreserve(MAX_HOSTREGS); @@ -24137,7 +24146,7 @@ case 556: /* clo ek r */ r[1+2] = p[1]; r[1+3] = p[2]; } r += 1; /* shift reg. wnd */ -s_l_v10445: /* ek r k iport */ +s_l_v10463: /* ek r k iport */ (void)(objptr_from_obj(r[3])[0] = (r[1])); hreserve(hbsz(2+1), 4); /* 4 live regs */ *--hp = r[2]; @@ -24171,7 +24180,7 @@ gs_benchmark_2Dfile: /* k fname */ hreserve(hbsz(1), 2); /* 2 live regs */ *--hp = obj_from_void(0); r[2] = (hendblk(1)); - r[3] = ((obj)fopen(stringchars((r[1])), stringchars((cx__233166)))); + r[3] = ((obj)fopen(stringchars((r[1])), stringchars((cx__233169)))); hreserve(hbsz(3+1), 4); /* 4 live regs */ *--hp = r[2]; *--hp = r[0]; @@ -24187,12 +24196,12 @@ gs_benchmark_2Dfile: /* k fname */ r[6+4] = r[2]; r += 6; /* shift reg wnd */ rreserve(MAX_HOSTREGS); - goto s_l_v10409; + goto s_l_v10427; } else { r[5+0] = (cx_file_2Derror); pc = objptr_from_obj(r[5+0])[0]; r[5+1] = r[4]; - r[5+2] = (cx__233170); + r[5+2] = (cx__233173); r[5+3] = r[1]; r += 5; /* shift reg wnd */ rreserve(MAX_HOSTREGS); @@ -24207,7 +24216,7 @@ case 559: /* clo ek r */ r[1+3] = p[2]; r[1+4] = p[3]; } r += 1; /* shift reg. wnd */ -s_l_v10409: /* ek r fname k iport */ +s_l_v10427: /* ek r fname k iport */ (void)(objptr_from_obj(r[4])[0] = (r[1])); hreserve(hbsz(2+1), 5); /* 5 live regs */ *--hp = r[3]; @@ -24259,7 +24268,7 @@ case 561: /* clo ek . */ *--hp = obj_from_case(562); r[4] = (hendblk(2+1)); r[0] = r[4]; - r[1] = (cx__234969); + r[1] = (cx__234972); goto gs_repl_2Deval_2Dtop_2Dform; case 562: /* clo ek . */ @@ -24285,7 +24294,7 @@ case 563: /* clo ek r */ r[1+3] = p[2]; } r += 1; /* shift reg. wnd */ /* ek r fname k */ - r[4] = (cxs_syntax_2Dmatch_3F((cx__234975), (r[1]))); + r[4] = (cxs_syntax_2Dmatch_3F((cx__234978), (r[1]))); if (bool_from_obj(r[4])) { r[0] = r[3]; pc = objptr_from_obj(r[0])[0]; @@ -24298,7 +24307,7 @@ case 563: /* clo ek r */ r[5+0] = (cx_error); pc = objptr_from_obj(r[5+0])[0]; r[5+1] = r[3]; - r[5+2] = (cx__234974); + r[5+2] = (cx__234977); r[5+3] = r[2]; r += 5; /* shift reg wnd */ rreserve(MAX_HOSTREGS); @@ -24339,32 +24348,32 @@ case 566: /* clo ek r */ r += 1; /* shift reg. wnd */ /* ek r k */ r[3] = (cdr((r[1]))); - if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__235018), (r[3])))) { + if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__235021), (r[3])))) { r[4] = (cdr((r[3]))); r[4] = (car((r[4]))); r[0] = r[2]; r[1] = r[4]; goto gs_process_2Dfile; } else { - if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__235010), (r[3])))) { + if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__235013), (r[3])))) { r[4] = (cdr((r[3]))); r[4] = (car((r[4]))); r[0] = r[2]; r[1] = r[4]; goto gs_repl_2Dfile; } else { - if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__235002), (r[3])))) { + if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__235005), (r[3])))) { r[4] = (cdr((r[3]))); r[4] = (car((r[4]))); r[0] = r[2]; r[1] = r[4]; goto gs_benchmark_2Dfile; } else { - if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__234996), (r[3])))) { + if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__234999), (r[3])))) { r[0] = r[2]; goto gs_run_2Dtests; } else { - if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__234993), (r[3])))) { + if (bool_from_obj(cxs_syntax_2Dmatch_3F((cx__234996), (r[3])))) { cx__2Averbose_2A = obj_from_bool(1); r[0] = r[2]; goto gs_run_2Drepl; diff --git a/s.c b/s.c index bd6ecfe..86ce5e0 100644 --- a/s.c +++ b/s.c @@ -621,12 +621,12 @@ char *s_code[] = { "rror),@(y12:write-string)[02}}${.7,.7,.4^[02}.5W6]6", "P", "simple-error", - "%!0P12,.0W6${.2,.4,'(s5:Error),@(y19:print-error-message)[03}@(y5:rese" - "t)[20", + "%!0Pe,.0W6${.2,.4,'(s5:Error),@(y19:print-error-message)[03}@(y5:reset" + ")[20", "P", "assertion-violation", - "%!0P12,.0W6${.2,.4,'(s19:Assertion violation),@(y19:print-error-messag" - "e)[03}'1Z9]2", + "%!0Pe,.0W6${.2,.4,'(s19:Assertion violation),@(y19:print-error-message" + ")[03}'1Z9]2", "C", 0, "${'(l3:y4:kind;y7:message;y9:irritants;),'(y14:),@(y15:n" @@ -757,9 +757,9 @@ char *s_code[] = { "%2.1,${.3,@(y16:open-output-file)[01},@(y14:call-with-port)[22", "P", "read-line", - "%!0P51,.1u?{P10}{.1a},t,,#0.2,.4,.2,&3{%1:2R0,.0R8,.0?{.0}{'(c%0a),.2C" - "=}_1?{.0R8?{.1}{f}?{.0]2}:1P90,:1P61.0]3}'(c%0d),.1C=?{f,:0^[21}:1,.1W" - "0f,:0^[21}.!0.0^_1[31", + "%!0P51,.1u?{Pi}{.1a},t,,#0.2,.4,.2,&3{%1:2R0,.0R8,.0?{.0}{'(c%0a),.2C=" + "}_1?{.0R8?{.1}{f}?{.0]2}:1P90,:1P61.0]3}'(c%0d),.1C=?{f,:0^[21}:1,.1W0" + "f,:0^[21}.!0.0^_1[31", "P", "read-substring!", "%4.1,,#0.5,.4,.4,.3,.8,&5{%1:0,.1I