Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

+checksum jets for zuse.hoon #709

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/noun/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ vere_library(
"@sigsegv",
"@softfloat",
"@urcrypt",
"@zlib",
] + select({
"@platforms//os:macos": ["//pkg/noun/platform/darwin"],
"@platforms//os:linux": ["//pkg/noun/platform/linux"],
Expand Down
127 changes: 127 additions & 0 deletions pkg/noun/jets/e/adler.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
#include <imprison.h>
#include <jets/k.h>
#include <log.h>
#include <nock.h>
#include <retrieve.h>
#include <types.h>
#include <xtract.h>

static void _x_octs(u3_noun octs, u3_atom* p_octs, u3_atom* q_octs) {

if (c3n == u3r_mean(octs,
2, p_octs,
3, q_octs, 0)){
u3m_bail(c3__exit);
}

if (c3n == u3a_is_atom(*p_octs) ||
c3n == u3a_is_atom(*q_octs)) {
u3m_bail(c3__exit);
}
}

static c3_o _x_octs_buffer(u3_atom* p_octs, u3_atom *q_octs,
c3_w* p_octs_w, c3_y** buf_y,
c3_w* len_w, c3_w* lead_w)
{
if (c3n == u3r_safe_word(*p_octs, p_octs_w)) {
return c3n;
}

*len_w = u3r_met(3, *q_octs);

if (c3y == u3a_is_cat(*q_octs)) {
*buf_y = (c3_y*)q_octs;
}
else {
u3a_atom* ptr_a = u3a_to_ptr(*q_octs);
*buf_y = (c3_y*)ptr_a->buf_w;
}

*lead_w = 0;

if (*p_octs_w > *len_w) {
*lead_w = *p_octs_w - *len_w;
}
else {
*len_w = *p_octs_w;
}

return c3y;
}

#define BASE 65521
#define NMAX 5552

u3_noun _qe_adler32(u3_noun octs)
{
u3_atom p_octs, q_octs;

_x_octs(octs, &p_octs, &q_octs);

c3_w p_octs_w, len_w, lead_w;
c3_y *buf_y;

if (c3n == _x_octs_buffer(&p_octs, &q_octs,
&p_octs_w, &buf_y,
&len_w, &lead_w)) {
return u3_none;
}

c3_w adler_w, sum2_w;

adler_w = 0x1;
sum2_w = 0x0;

c3_w pos_w = 0;

// Process all non-zero bytes
//
while (pos_w < len_w) {

c3_w rem_w = (len_w - pos_w);

if (rem_w > NMAX) {
rem_w = NMAX;
}

while (rem_w--) {
adler_w += *(buf_y + pos_w++);
sum2_w += adler_w;
}

adler_w %= BASE;
sum2_w %= BASE;
}

// Process leading zeros
//
while (pos_w < p_octs_w) {

c3_w rem_w = (p_octs_w - pos_w);

if (rem_w > NMAX) {
rem_w = NMAX;
}

// leading zeros: adler sum is unchanged
sum2_w += rem_w*adler_w;
pos_w += rem_w;

adler_w %= BASE;
sum2_w %= BASE;
}

return u3i_word(sum2_w << 16 | adler_w);
}


u3_noun
u3we_adler32(u3_noun cor)
{
u3_noun octs;

u3x_mean(cor, u3x_sam, &octs, 0);

return _qe_adler32(octs);
}
56 changes: 56 additions & 0 deletions pkg/noun/jets/e/crc.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/// @file

#include <stdio.h>
#include <allocate.h>
#include "zlib.h"

#include "jets/w.h"

#include "noun.h"

u3_noun
u3qe_crc32(u3_noun input_octs)
{
u3_atom tail = u3t(input_octs);
c3_w len_w = u3r_met(3, tail);
c3_y* input;

if (c3y == u3a_is_cat(tail)) {
input = (c3_y*)&tail;
}
else {
u3a_atom* vat_u = u3a_to_ptr(tail);
input = (c3_y*)vat_u->buf_w;
}

c3_w p_octs_w;

if (c3n == u3r_safe_word(u3h(input_octs), &p_octs_w)) {
return u3_none;
}

c3_w lead_w = p_octs_w - len_w;
c3_w crc = 0L;

crc = crc32(crc, input, len_w);

c3_w zero_w = 0;
while (lead_w-- > 0) {
crc = crc32(crc, &zero_w, 1);
}

return u3i_word(crc);
}

u3_noun
u3we_crc32(u3_noun cor)
{
u3_noun a = u3r_at(u3x_sam, cor);

if ( (u3du(a) == c3y) && (u3ud(u3h(a))) == c3y && (u3ud(u3t(a))) == c3y) {
return u3qe_crc32(a);
}
else {
return u3m_bail(c3__exit);
}
}
19 changes: 19 additions & 0 deletions pkg/noun/jets/tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -2341,6 +2341,23 @@ static u3j_core _138_hex_blake_d[] =
{}
};

static u3j_harm _137_hex__adler32_a[] = {{".2", u3we_adler32, c3y}, {}};
static u3j_core _137_hex__adler_d[] =
{ { "adler32", 7, _137_hex__adler32_a, 0, no_hashes },
{}
};
static u3j_harm _137_hex__crc32_a[] = {{".2", u3we_crc32}, {}};
static u3j_core _137_hex__crc_d[] =
{ {"crc32", 7, _137_hex__crc32_a, 0, no_hashes },
{}
};

static u3j_core _137_hex_checksum_d[] =
{ { "adler", 3, 0, _137_hex__adler_d, no_hashes },
{ "crc", 3, 0, _137_hex__crc_d, no_hashes},
{}
};

static u3j_core _138_hex_d[] =
{ { "lore", 63, _140_hex_lore_a, 0, no_hashes },
{ "leer", 63, _140_hex_leer_a, 0, no_hashes },
Expand All @@ -2359,6 +2376,7 @@ static u3j_core _138_hex_d[] =
{ "secp", 6, 0, _140_hex_secp_d, no_hashes },
{ "mimes", 31, 0, _140_hex_mimes_d, no_hashes },
{ "json", 31, 0, _139_hex_json_d, no_hashes },
{ "checksum", 15, 0, _137_hex_checksum_d, no_hashes},
{}
};

Expand Down Expand Up @@ -2621,6 +2639,7 @@ static u3j_core _d[] =
{ { "k140", 0, 0, _k140_d, _k140_ha, 0, (u3j_core*) 140, 0 },
{ "k139", 0, 0, _k139_d, no_hashes, 0, (u3j_core*) 139, 0 },
{ "k138", 0, 0, _k138_d, no_hashes, 0, (u3j_core*) 138, 0 },
{ "k137", 0, 0, _k138_d, no_hashes, 0, (u3j_core*) 137, 0 },
{ "a50", 0, 0, _a50_d, _k140_ha, 0, (u3j_core*) c3__a50, 0 },
{}
};
Expand Down
3 changes: 3 additions & 0 deletions pkg/noun/jets/w.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@
u3_noun u3we_blake3_chunk_output(u3_noun);
u3_noun u3we_blake3_compress(u3_noun);

u3_noun u3we_adler32(u3_noun);
u3_noun u3we_crc32(u3_noun);

u3_noun u3we_ripe(u3_noun);

u3_noun u3we_make(u3_noun);
Expand Down