From 2d9019a93d81019976fed29540102ab92b4a4c68 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Sat, 4 Jan 2014 14:57:44 -0800 Subject: [PATCH] Hint refactoring. --- Makefile | 4 ++-- gen191/6/ap.c | 6 +++++- gen191/6/ut_fink.c | 6 +++--- gen191/6/ut_mint.c | 2 +- gen191/6/ut_mull.c | 2 +- gen191/6/ut_play.c | 2 +- include/c/motes.h | 1 + 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index b1dd25b9e..80efdf4f7 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ LIB=$(PWD)/lib RM=rm -f CC=gcc -CLD=gcc -g -L/usr/local/lib -L/opt/local/lib +CLD=gcc -O3 -L/usr/local/lib -L/opt/local/lib YACC=bison -v -b$(GENERATED)/y LEX=lex @@ -56,7 +56,7 @@ INCLUDE=include GENERATED=generated DEFINES=-DU2_OS_$(OS) -DU2_OS_ENDIAN_$(ENDIAN) -D U2_LIB=\"$(LIB)\" -CFLAGS=-g \ +CFLAGS=-O3 \ -I/usr/local/include \ -I/opt/local/include \ -I$(INCLUDE) \ diff --git a/gen191/6/ap.c b/gen191/6/ap.c index 1650667cc..d86fd1f75 100644 --- a/gen191/6/ap.c +++ b/gen191/6/ap.c @@ -344,6 +344,7 @@ /*** **** ***/ +/* _open_do_pq(sgts) // ~= { return u2_bt @@ -351,6 +352,7 @@ u2_bc(wir_r, c3__germ, u2_rx(wir_r, p_gen)), u2_rx(wir_r, q_gen)); } + _open_do_pq(sgbr) // ~| { return u2_bt @@ -446,6 +448,7 @@ u2_bq(wir_r, c3__memo, c3__dtsg, u2_blip, u2_rx(wir_r, p_gen)), u2_rx(wir_r, q_gen)); } +*/ /*** **** ***/ @@ -581,6 +584,7 @@ _open_pq (brkt); +/* _open_pq (sgts); _open_pq (sgbr); _open_pq (sgcl); @@ -591,7 +595,7 @@ _open_pq (sghx); _open_pqrs(sgcn); _open_pq (sgls); - +*/ _open_pq (smcl); // _open_p (smdq); // _open_pq (smsg); diff --git a/gen191/6/ut_fink.c b/gen191/6/ut_fink.c index 2aa0aba92..a0ea9a952 100644 --- a/gen191/6/ut_fink.c +++ b/gen191/6/ut_fink.c @@ -15,7 +15,7 @@ u2_noun way, // retain u2_noun cog) // retain { - // u2_noun dun = j2_mcy(Pt6, ut, dunq)(wir_r, van, "type", sut); + u2_noun dun = j2_mcy(Pt6, ut, dunq)(wir_r, van, "type", sut); u2_noun nuc = (u2_blip == cog) ? j2_mcy(Pt6, ut, shew) (wir_r, van, @@ -26,7 +26,7 @@ (wir_r, van, "find-limb", 'a', u2_rx(wir_r, cog)); u2_noun pro; - // u2_bl_push(wir_r, u2_bc(wir_r, c3__mean, dun)); + u2_bl_push(wir_r, u2_bc(wir_r, c3__mean, dun)); u2_bl_push(wir_r, u2_bc(wir_r, c3__mean, nuc)); { u2_noun hoq = j2_mcy(Pt6, ut, find)(wir_r, van, sut, dep, way, cog); @@ -40,7 +40,7 @@ u2_rl_lose(wir_r, hoq); } } - // u2_bl_drop(wir_r); + u2_bl_drop(wir_r); u2_bl_drop(wir_r); return pro; diff --git a/gen191/6/ut_mint.c b/gen191/6/ut_mint.c index b03978663..699c573f7 100644 --- a/gen191/6/ut_mint.c +++ b/gen191/6/ut_mint.c @@ -764,7 +764,7 @@ u2_rz(wir_r, ruf); return ret; } - case c3__sgcb: u2_bi_cell(wir_r, u2_t(gen), &p_gen, &q_gen); + case c3__sgzp: u2_bi_cell(wir_r, u2_t(gen), &p_gen, &q_gen); _mint_used(wir_r); { u2_noun typ = j2_mcy(Pt6, ut, play)(wir_r, van, sut, p_gen); diff --git a/gen191/6/ut_mull.c b/gen191/6/ut_mull.c index 195d82d62..4a074114e 100644 --- a/gen191/6/ut_mull.c +++ b/gen191/6/ut_mull.c @@ -716,7 +716,7 @@ u2_rz(wir_r, ruf); return ret; } - case c3__sgcb: u2_bi_cell(wir_r, u2_t(gen), &p_gen, &q_gen); + case c3__sgzp: u2_bi_cell(wir_r, u2_t(gen), &p_gen, &q_gen); _mull_used(wir_r); { u2_noun typ = j2_mcy(Pt6, ut, play)(wir_r, van, sut, p_gen); diff --git a/gen191/6/ut_play.c b/gen191/6/ut_play.c index 736698b9d..992a9c7fb 100644 --- a/gen191/6/ut_play.c +++ b/gen191/6/ut_play.c @@ -425,7 +425,7 @@ u2_rz(wir_r, ruf); return ret; } - case c3__sgcb: u2_bi_cell(wir_r, u2_t(gen), &p_gen, &q_gen); + case c3__sgzp: u2_bi_cell(wir_r, u2_t(gen), &p_gen, &q_gen); _play_used(wir_r); { u2_noun typ = j2_mcy(Pt6, ut, play)(wir_r, van, sut, p_gen); diff --git a/include/c/motes.h b/include/c/motes.h index a2f5b85c7..47ae018de 100644 --- a/include/c/motes.h +++ b/include/c/motes.h @@ -878,6 +878,7 @@ # define c3__sgsg c3_s4('s','g','s','g') # define c3__sgsp c3_s4('s','g','s','p') # define c3__sgts c3_s4('s','g','t','s') +# define c3__sgzp c3_s4('s','g','z','p') # define c3__show c3_s4('s','h','o','w') # define c3__shud c3_s4('s','h','u','d') # define c3__shut c3_s4('s','h','u','t')