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

Merge and minor merge changes

Browse Source
This commit is contained in:
Gavin Whelan 2014-05-30 15:59:58 -07:00
commit 9933bca9cf
6 changed files with 193 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -57,7 +57,7 @@ endif
INCLUDE=include
MDEFINES=-DU2_OS_$(OS) -DU2_OS_ENDIAN_$(ENDIAN) -D U2_LIB=\"$(LIB)\"
CFLAGS= -O -g \
CFLAGS= -O3 \
-I/usr/local/include \
-I/opt/local/include \
-I$(INCLUDE) \

12
f/nock.c
View File

@ -14,6 +14,10 @@
static u2_noun _nock_mool(u2_noun, u2_noun, u2_kode*);
static u2_noun _nock_molg(u2_noun, u2_noun, u2_kode*);
#ifdef GHETTO
extern c3_w nox_w;
#endif
/* _nock_pray_mool(): load from namespace, in virtual mode.
*/
static u2_noun
@ -304,6 +308,10 @@ _nock_cool(u2_noun bus,
while ( 1 ) {
u2_tx_did_hop(u2_Wire, 1);
#ifdef GHETTO
nox_w++;
#endif
if ( u2_no == u2du(fol) ) {
return u2_cm_bail(c3__exit);
}
@ -556,6 +564,10 @@ _nock_mool(u2_noun bus,
while ( 1 ) {
u2_tx_did_hop(u2_Wire, 1);
#ifdef GHETTO
nox_w++;
#endif
if ( u2_no == u2du(fol) ) {
*pon = 2;
u2z(bus); u2z(fol);

22
f/trac.c
View File

@ -692,19 +692,33 @@ _print_wall(u2_noun wal,
}
#endif
#ifdef GHETTO
c3_w nox_w;
#endif
/* u2_tx_slog(): print debug syslog [0-3 tank] 0=debug 3=alarm
*/
void
u2_tx_slog(u2_ray wir_r,
u2_noun luf) // retain
{
#if 0
#ifdef GHETTO
struct timeval t;
static struct timeval p;
struct timeval d;
static int haz;
gettimeofday(&t, 0);
timersub(&t, &p, &d);
printf("%ld.%d ", d.tv_sec, d.tv_usec);
if ( haz ) {
c3_w ms_w;
timersub(&t, &p, &d);
ms_w = (d.tv_sec * 1000) + (d.tv_usec / 1000);
printf("%d.%dms (%d) ", ms_w, (d.tv_usec % 1000) / 10, nox_w);
}
haz = 1;
nox_w = 0;
#endif
{
if ( u2_yes == u2du(luf) ) {
@ -718,7 +732,7 @@ u2_tx_slog(u2_ray wir_r,
u2_lo_tank(0, u2k(u2t(luf)));
}
}
#if 0
#ifdef GHETTO
p = t;
#endif
}

66
gen164/6/slot.c Normal file
View File

@ -0,0 +1,66 @@
/* j/6/slot.c
**
** This file is in the public domain.
*/
#include "all.h"
#include "../pit.h"
/* functions
*/
u2_noun // transfer
j2_mby(Pt6, slot)(u2_wire wir_r,
u2_atom axe, // retain
u2_noun vax) // retain
{
u2_weak fag = u2_frag(axe, u2t(vax));
fprintf(stderr, "slot axe %d\r\n", axe);
if ( u2_none == fag ) {
return u2_bl_bail(wir_r, c3__exit);
}
else {
u2_noun typ = j2_mcy(Pt6, ut, peek)(
}
c3_w i_w, met_w = c3_min(u2_met(3, axe), u2_met(3, vax));
if ( u2_no == _slot_fiz(wir_r, axe, vax) ) {
return u2_no;
}
for ( i_w = 0; i_w < met_w; i_w++ ) {
c3_y axe_y = u2_byte(i_w, axe);
c3_y vax_y = u2_byte(i_w, vax);
if ( (axe_y >= 'A') && (axe_y <= 'Z') ) axe_y = 0;
if ( (vax_y >= 'A') && (vax_y <= 'Z') ) vax_y = 0;
if ( axe_y && vax_y && (axe_y != vax_y) ) {
return u2_no;
}
}
return u2_yes;
}
u2_noun // transfer
j2_mb(Pt6, slot)(u2_wire wir_r,
u2_noun cor) // retain
{
u2_noun axe, vax;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &axe, u2_cv_sam_3, &vax, 0)) ||
(u2_no == u2ud(axe)) ||
(u2_no == u2du(vax)) )
{
return u2_bl_bail(wir_r, c3__fail);
} else {
return j2_mby(Pt6, slot)(wir_r, axe, vax);
}
}
/* structures
*/
u2_ho_jet
j2_mbj(Pt6, slot)[] = {
{ ".2", c3__hevy, j2_mb(Pt6, slot), u2_jet_live | u2_jet_test, u2_none, u2_none },
{ }
};

79
gen164/6/spec.c Normal file
View File

@ -0,0 +1,79 @@
/* j/6/fitz.c
**
** This file is in the public domain.
*/
#include "all.h"
#include "../pit.h"
/* functions
*/
static u2_bean
_fitz_fiz(u2_wire wir_r,
u2_noun yaz,
u2_noun wix)
{
c3_w yaz_w = u2_met(3, yaz);
c3_w wix_w = u2_met(3, wix);
c3_y yaz_y, wix_y;
yaz_y = (0 == yaz_w) ? 0 : u2_byte((yaz_w - 1), yaz);
if ( (yaz_y < 'A') || (yaz_y > 'Z') ) yaz_y = 0;
wix_y = (0 == wix_w) ? 0 : u2_byte((wix_w - 1), wix);
if ( (wix_y < 'A') || (wix_y > 'Z') ) wix_y = 0;
if ( yaz_y && wix_y ) {
if ( !wix_y || (wix_y > yaz_y) ) {
return u2_no;
}
}
return u2_yes;
}
u2_noun // transfer
j2_mby(Pt6, fitz)(u2_wire wir_r,
u2_noun yaz, // retain
u2_noun wix) // retain
{
c3_w i_w, met_w = c3_min(u2_met(3, yaz), u2_met(3, wix));
if ( u2_no == _fitz_fiz(wir_r, yaz, wix) ) {
return u2_no;
}
for ( i_w = 0; i_w < met_w; i_w++ ) {
c3_y yaz_y = u2_byte(i_w, yaz);
c3_y wix_y = u2_byte(i_w, wix);
if ( (yaz_y >= 'A') && (yaz_y <= 'Z') ) yaz_y = 0;
if ( (wix_y >= 'A') && (wix_y <= 'Z') ) wix_y = 0;
if ( yaz_y && wix_y && (yaz_y != wix_y) ) {
return u2_no;
}
}
return u2_yes;
}
u2_noun // transfer
j2_mb(Pt6, fitz)(u2_wire wir_r,
u2_noun cor) // retain
{
u2_noun yaz, wix;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &yaz, u2_cv_sam_3, &wix, 0)) ||
(u2_no == u2ud(yaz)) ||
(u2_no == u2ud(wix)) )
{
return u2_bl_bail(wir_r, c3__fail);
} else {
return j2_mby(Pt6, fitz)(wir_r, yaz, wix);
}
}
/* structures
*/
u2_ho_jet
j2_mbj(Pt6, fitz)[] = {
{ ".2", c3__hevy, j2_mb(Pt6, fitz), Tier6_a, u2_none, u2_none },
{ }
};

23
v/raft.c
View File

@ -1535,7 +1535,9 @@ _raft_lame(u2_reck* rec_u, u2_noun ovo, u2_noun why, u2_noun tan)
static void
_raft_punk(u2_reck* rec_u, u2_noun ovo)
{
// c3_c* txt_c = u2_cr_string(u2h(u2t(ovo)));
#ifdef GHETTO
c3_c* txt_c = u2_cr_string(u2h(u2t(ovo)));
#endif
c3_w sec_w;
// static c3_w num_w;
u2_noun gon;
@ -1555,14 +1557,23 @@ _raft_punk(u2_reck* rec_u, u2_noun ovo)
u2_Host.beh_u.run_w = 0;
}
// struct timeval b4, f2, d0;
// gettimeofday(&b4, 0);
#ifdef GHETTO
struct timeval b4, f2, d0;
gettimeofday(&b4, 0);
#endif
gon = u2_lo_soft(rec_u, sec_w, u2_reck_poke, u2k(ovo));
// gettimeofday(&f2, 0);
// timersub(&f2, &b4, &d0);
// uL(fprintf(uH, "%%punk %ld.%d\n", d0.tv_sec, d0.tv_usec));
#ifdef GHETTO
c3_w ms_w;
gettimeofday(&f2, 0);
timersub(&f2, &b4, &d0);
ms_w = (d0.tv_sec * 1000) + (d0.tv_usec / 1000);
uL(fprintf(uH, "%%punk %s %d.%dms\n", txt_c, ms_w, (d0.tv_usec % 1000) / 10));
free(txt_c);
#endif
if ( u2_blip != u2h(gon) ) {
u2_noun why = u2k(u2h(gon));