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

midway through adding making for bytecode

Browse Source
This commit is contained in:
Paul Driver 2018-03-09 16:04:47 -08:00
parent 16e3e5cf6a
commit 42c460ed3b
3 changed files with 76 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/noun/nock.h
View File

@ -64,3 +64,7 @@
/* u3n_beep(): promote bytecode state.
*/
void u3n_beep(u3p(u3h_root) har_p);
/* u3n_bark(): mark bytecode cache.
*/
c3_w u3n_bark();

8
noun/manage.c
View File

@ -470,7 +470,7 @@ u3m_mark(void)
{
c3_w tot_w = 0;
tot_w += u3h_mark(u3R->jed.har_p);
tot_w += u3h_mark(u3R->byc.har_p);
tot_w += u3n_bark();
tot_w += u3a_mark_noun(u3R->jed.das);
tot_w += u3a_mark_noun(u3R->ski.gul);
tot_w += u3a_mark_noun(u3R->bug.tax);
@ -1673,12 +1673,6 @@ u3m_boot(c3_o nuu_o, c3_o bug_o, c3_c* dir_c,
*/
u3j_boot();
#ifdef TREE_NOCK
printf("nock: tree\r\n");
#else
printf("nock: bytecode\r\n");
#endif
/* Install or reactivate the kernel.
*/
if ( _(nuu_o) ) {

77
noun/nock.c
View File

@ -3,6 +3,8 @@
*/
#include "all.h"
#define TREE_NOCK
static u3_noun _n_nock_on(u3_noun bus, u3_noun fol);
static u3_noun _n_burn_on(u3_noun bus, u3_noun fol);
@ -574,7 +576,7 @@ u3n_nock_an(u3_noun bus, u3_noun fol)
* as it executes, along with some other information. very spammy.
*/
#if 0
#if 1
// match to OPCODE TABLE
static char* names[] = {
"halt", "bail",
@ -948,7 +950,7 @@ _n_comp(u3_noun* ops, u3_noun fol, c3_o los_o, c3_o tel_o)
return tot_s;
}
#if 0
#if 1
static void _n_print_byc(c3_y* pog, c3_s her_s);
#endif
@ -1191,7 +1193,7 @@ typedef struct {
} burnframe;
/* _n_burn(): pog: program
* bus: subject
* bus: subject (TRANSFER)
* mov: -1 north, 1 south
* off: 0 north, -1 south
*/
@ -1772,7 +1774,7 @@ _n_burn(c3_y* pog, u3_noun bus, c3_ys mov, c3_ys off)
}
}
#if 0
#if 1
/* _n_print_byc(): print bytecode. used for debugging.
*/
static void
@ -1866,7 +1868,7 @@ _n_burn_on(u3_noun bus, u3_noun fol)
c3_y* pog = _n_find(fol);
c3_ys mov, off;
u3z(fol);
//u3z(fol);
if ( c3y == u3a_is_north(u3R) ) {
mov = -1;
off = 0;
@ -1875,7 +1877,8 @@ _n_burn_on(u3_noun bus, u3_noun fol)
mov = 1;
off = -1;
}
u3_noun pro = _n_burn(pog, bus, mov, off);
//u3_noun pro = _n_burn(pog, bus, mov, off);
u3_noun pro = _n_nock_on(bus, fol);
return pro;
}
@ -1978,6 +1981,68 @@ u3n_beep(u3p(u3h_root) har_p)
u3h_walk(har_p, _n_reap);
}
static c3_w
_n_mark_byc(c3_y* pog)
{
c3_y cod_y;
c3_s ip_s = 0;
c3_w tot_w = 0;
u3_noun non;
while ( pog[ip_s] != HALT ) {
cod_y = pog[ip_s++];
switch ( cod_y ) {
default:
ip_s += _n_arg(cod_y);
break;
case CUSH: case FRAG: case FLAG: case LILN: case LITN:
case SAMN: case TICK: case KICK:
non = _n_rean(pog, &ip_s);
tot_w += u3a_mark_noun(non);
break;
case SKIB: case SLIB:
ip_s += sizeof(c3_y);
non = _n_rean(pog, &ip_s);
tot_w += u3a_mark_noun(non);
break;
case SKIM: case SLIM:
ip_s += sizeof(c3_s);
non = _n_rean(pog, &ip_s);
tot_w += u3a_mark_noun(non);
break;
}
}
return tot_w;
}
static c3_w bam_w;
/* _n_bam(): u3h_walk helper for u3n_bark
*/
static void
_n_bam(u3_noun kev)
{
c3_y* pog = u3a_into(u3t(kev));
bam_w += u3a_mark_noun(kev) + _n_mark_byc(pog);
}
/* u3n_bark(): mark the bytecode cache for gc.
*/
c3_w
u3n_bark()
{
return 0;
/*
bam_w = 0;
u3h_walk(u3R->byc.har_p, _n_bam);
return bam_w;
*/
}
#if 0
/* _n_print_stack(): print out the cap stack up to a designated "empty"
* used only for debugging