Merge pull request #3486 from urbit/jb/fix-samp

vere: fixes -P sample profiling
This commit is contained in:
Joe Bryan 2020-09-15 10:34:38 -07:00 committed by GitHub
commit ee50586070
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions

View File

@ -10,7 +10,6 @@ u3i_bytes(c3_w a_w,
const c3_y* b_y) const c3_y* b_y)
{ {
u3_noun pro; u3_noun pro;
u3t_on(mal_o);
// Strip trailing zeroes. // Strip trailing zeroes.
// //
@ -40,6 +39,7 @@ u3i_bytes(c3_w a_w,
// Allocate, fill, return. // Allocate, fill, return.
// //
u3t_on(mal_o);
{ {
c3_w len_w = (a_w + 3) >> 2; c3_w len_w = (a_w + 3) >> 2;
c3_w* nov_w = u3a_walloc((len_w + c3_wiseof(u3a_atom))); c3_w* nov_w = u3a_walloc((len_w + c3_wiseof(u3a_atom)));
@ -70,8 +70,8 @@ u3i_bytes(c3_w a_w,
pro = u3a_to_pug(u3a_outa(nov_w)); pro = u3a_to_pug(u3a_outa(nov_w));
} }
u3t_off(mal_o); u3t_off(mal_o);
return pro; return pro;
} }
@ -82,7 +82,6 @@ u3i_words(c3_w a_w,
const c3_w* b_w) const c3_w* b_w)
{ {
u3_noun pro; u3_noun pro;
u3t_on(mal_o);
// Strip trailing zeroes. // Strip trailing zeroes.
// //
@ -101,6 +100,7 @@ u3i_words(c3_w a_w,
// Allocate, fill, return. // Allocate, fill, return.
// //
u3t_on(mal_o);
{ {
c3_w* nov_w = u3a_walloc(a_w + c3_wiseof(u3a_atom)); c3_w* nov_w = u3a_walloc(a_w + c3_wiseof(u3a_atom));
u3a_atom* nov_u = (void*)nov_w; u3a_atom* nov_u = (void*)nov_w;
@ -120,8 +120,8 @@ u3i_words(c3_w a_w,
pro = u3a_to_pug(u3a_outa(nov_w)); pro = u3a_to_pug(u3a_outa(nov_w));
} }
u3t_off(mal_o); u3t_off(mal_o);
return pro; return pro;
} }
@ -132,7 +132,6 @@ u3i_chubs(c3_w a_w,
const c3_d* b_d) const c3_d* b_d)
{ {
u3_noun pro; u3_noun pro;
u3t_on(mal_o);
// Strip trailing zeroes. // Strip trailing zeroes.
// //
@ -151,6 +150,7 @@ u3i_chubs(c3_w a_w,
// Allocate, fill, return. // Allocate, fill, return.
// //
u3t_on(mal_o);
{ {
c3_w len_w = 2 * a_w; c3_w len_w = 2 * a_w;
@ -192,8 +192,8 @@ u3i_chubs(c3_w a_w,
pro = u3a_to_pug(u3a_outa(nov_w)); pro = u3a_to_pug(u3a_outa(nov_w));
} }
u3t_off(mal_o); u3t_off(mal_o);
return pro; return pro;
} }

View File

@ -704,10 +704,11 @@ u3_king_commence()
uv_timer_init(u3L, &u3K.tim_u); uv_timer_init(u3L, &u3K.tim_u);
// start up a "fast-compile" arvo for internal use only // start up a "fast-compile" arvo for internal use only
// (with hashboard always disabled) // (with hashboard and sample-profiling always disabled)
// //
sag_w = u3C.wag_w; sag_w = u3C.wag_w;
u3C.wag_w |= u3o_hashless; u3C.wag_w |= u3o_hashless;
u3C.wag_w &= ~u3o_debug_cpu;
u3m_boot_lite(); u3m_boot_lite();