ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-18 04:11:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into nextbreach

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
Luke Patmore 2014-06-04 15:54:21 -07:00
commit b431dad6e0
2 changed files with 45 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gen164/5/rd.c
View File

@ -12,6 +12,7 @@ union doub {
/* declarations
*/
extern u2_ho_jet j2_mcj(Pt5, rd, sun)[];
extern u2_ho_jet j2_mcj(Pt5, rd, mul)[];
extern u2_ho_jet j2_mcj(Pt5, rd, div)[];
extern u2_ho_jet j2_mcj(Pt5, rd, add)[];
@ -23,6 +24,33 @@ union doub {
/* functions
*/
/* sun
*/
u2_weak
j2_mcd(Pt5, rd, sun)(u2_wire wir_r,
u2_atom a)
{
union doub b;
b.d = (double) u2_chub(0, a);
return u2_ci_chubs(1, &b.c);
}
u2_weak
j2_mc(Pt5, rd, sun)(u2_wire wir_r,
u2_noun cor)
{
u2_noun a;
if (u2_no == u2_mean(cor, u2_cv_sam, &a, 0)
|| u2_no == u2_stud(a)) {
return u2_bl_bail(wir_r, c3__exit);
}
else {
return j2_mcd(Pt5, rd, sun)(wir_r, a);
}
}
/* mul
*/
u2_weak
@ -277,6 +305,11 @@ union doub {
/* structures
*/
u2_ho_jet
j2_mcj(Pt5, rd, sun)[] = {
{ ".2", c3__lite, j2_mc(Pt5, rd, sun), Tier5_test, u2_none, u2_none },
{ }
};
u2_ho_jet
j2_mcj(Pt5, rd, mul)[] = {
{ ".2", c3__lite, j2_mc(Pt5, rd, mul), Tier5_test, u2_none, u2_none },
@ -320,6 +353,7 @@ union doub {
u2_ho_driver
j2_mbd(Pt5, rd)[] = {
{ j2_sc(Pt5, rd, sun), j2_mcj(Pt5, rd, sun), 0, 0, u2_none },
{ j2_sc(Pt5, rd, mul), j2_mcj(Pt5, rd, mul), 0, 0, u2_none },
{ j2_sc(Pt5, rd, div), j2_mcj(Pt5, rd, div), 0, 0, u2_none },
{ j2_sc(Pt5, rd, add), j2_mcj(Pt5, rd, add), 0, 0, u2_none },

61
gen164/6/ap.c
View File

@ -309,7 +309,6 @@
u2_rx(wir_r, r_gen),
u2_nul));
}
#if 0
_open_do_pqr(cnsg) // %~
{
return u2_bq
@ -318,10 +317,11 @@
u2_rx(wir_r, q_gen),
u2_bo(wir_r,
u2_bc(wir_r,
u2_bc(wir_r, u2_nul, _6),
u2_bo(wir_r,
u2_bc(wir_r, u2_nul, _6)),
u2_rx(wir_r, r_gen))));
}
#endif
/***
****
***/
@ -344,7 +344,6 @@
/***
****
***/
/*
_open_do_pq(sgts) // ~=
{
return u2_bt
@ -352,7 +351,6 @@
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
@ -360,13 +358,6 @@
u2_bc(wir_r, c3__yelp, u2_rx(wir_r, p_gen)),
u2_rx(wir_r, q_gen));
}
_open_do_pq(sgcl) // ~:
{
return u2_bt
(wir_r, c3__sggr,
u2_bq(wir_r, c3__bank, c3__dtzz, u2_blip, u2_rx(wir_r, p_gen)),
u2_rx(wir_r, q_gen));
}
_open_do_pq(sggl) // ~>
{
return u2_bt
@ -374,36 +365,12 @@
u2_bq(wir_r, c3__sggr, u2_rx(wir_r, p_gen), u2_nul, _1),
u2_rx(wir_r, q_gen));
}
_open_do_pq(sghp) // ~-
{
return u2_bt
(wir_r, c3__sggr,
u2_bq(wir_r, c3__sole, c3__dtzz, u2_blip, u2_rx(wir_r, p_gen)),
u2_rx(wir_r, q_gen));
}
_open_do_pq(sgdt) // ~.
{
return u2_bc
(wir_r, c3__sgcn,
u2_bq(wir_r,
u2_rx(wir_r, p_gen),
u2_bc(wir_r, u2_nul, _4),
u2_nul,
u2_rx(wir_r, q_gen)));
}
_open_do_pq(sgbc) // ~$
{
return u2_bt(wir_r, c3__sggr,
u2_bq(wir_r, c3__live,
c3__dtzz, u2_blip, u2_rx(wir_r, p_gen)),
u2_rx(wir_r, q_gen));
}
_open_do_pq(sghx) // ~#
{
return u2_bt(wir_r, c3__sggr,
u2_bq(wir_r, c3__ping,
c3__dtzz, u2_blip, u2_rx(wir_r, p_gen)),
u2_rx(wir_r, q_gen));
}
static u2_noun
_sgcn_a(u2_wire wir_r,
@ -448,7 +415,6 @@
u2_bq(wir_r, c3__memo, c3__dtzz, u2_blip, u2_rx(wir_r, p_gen)),
u2_rx(wir_r, q_gen));
}
*/
/***
****
***/
@ -580,22 +546,17 @@
_open_pqrs(cnkt);
_open_pq (cnhp);
_open_pqr (cnls);
// _open_pqr (cnsg);
_open_pqr (cnsg);
_open_pq (brkt);
/*
_open_pq (sgts);
_open_pq (sgbr);
_open_pq (sgcl);
_open_pq (sggl);
_open_pq (sghp);
_open_pq (sgdt);
_open_pq (sgbc);
_open_pq (sghx);
_open_pqrs(sgcn);
_open_pq (sgls);
*/
_open_pq (sgts);
_open_pq (sgbr);
_open_pq (sggl);
_open_pq (sgbc);
_open_pqrs(sgcn);
_open_pq (sgls);
_open_pq (smcl);
// _open_p (smdq);
// _open_pq (smsg);