emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://github.com/UpstandingHackers/hammer into h_bind

Browse source
This commit is contained in:
Sven M. Hallberg 2015-03-04 14:47:49 +01:00
commit 9a8dca2c04
4 changed files with 68 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/bitreader.c
View file

@ -62,7 +62,7 @@ int64_t h_read_bits(HInputStream* state, int count, char signed_p) {
int i;
for (i = 0; count > 0; i += 8) {
count -= 8;
out |= state->input[state->index++] << i;
out |= (int64_t)state->input[state->index++] << i;
}
}
} else {
@ -99,7 +99,7 @@ int64_t h_read_bits(HInputStream* state, int count, char signed_p) {
if (state->endianness & BYTE_BIG_ENDIAN) {
out = out << segment_len | segment;
} else { // BYTE_LITTLE_ENDIAN
out |= segment << offset;
out |= (int64_t)segment << offset;
offset += segment_len;
}
count -= segment_len;

2
src/glue.c
View file

@ -173,7 +173,7 @@ HParsedToken *h_seq_index_vpath(const HParsedToken *p, size_t i, va_list va)
int j;
while((j = va_arg(va, int)) >= 0)
ret = h_seq_index(p, j);
ret = h_seq_index(ret, j);
return ret;
}

64
src/t_regression.c
View file

@ -3,6 +3,7 @@
#include "glue.h"
#include "hammer.h"
#include "test_suite.h"
#include "internal.h"
static void test_bug118(void) {
// https://github.com/UpstandingHackers/hammer/issues/118
@ -33,6 +34,69 @@ static void test_bug118(void) {
h_parse_result_free(p);
}
static void test_seq_index_path(void) {
HArena *arena = h_new_arena(&system_allocator, 0);
HParsedToken *seq = h_make_seqn(arena, 1);
HParsedToken *seq2 = h_make_seqn(arena, 2);
HParsedToken *tok1 = h_make_uint(arena, 41);
HParsedToken *tok2 = h_make_uint(arena, 42);
seq->seq->elements[0] = seq2;
seq->seq->used = 1;
seq2->seq->elements[0] = tok1;
seq2->seq->elements[1] = tok2;
seq2->seq->used = 2;
g_check_cmp_int(h_seq_index_path(seq, 0, -1)->token_type, ==, TT_SEQUENCE);
g_check_cmp_int(h_seq_index_path(seq, 0, 0, -1)->token_type, ==, TT_UINT);
g_check_cmp_int64(h_seq_index_path(seq, 0, 0, -1)->uint, ==, 41);
g_check_cmp_int64(h_seq_index_path(seq, 0, 1, -1)->uint, ==, 42);
}
#define MK_INPUT_STREAM(buf,len,endianness_) \
{ \
.input = (uint8_t*)buf, \
.length = len, \
.index = 0, \
.bit_offset = 0, \
.endianness = endianness_ \
}
static void test_read_bits_48(void) {
{
HInputStream is = MK_INPUT_STREAM("\x12\x34\x56\x78\x9A\xBC", 6, BIT_LITTLE_ENDIAN | BYTE_LITTLE_ENDIAN);
g_check_cmp_int64(h_read_bits(&is, 32, false), ==, 0x78563412);
g_check_cmp_int64(h_read_bits(&is, 16, false), ==, 0xBC9A);
}
{
HInputStream is = MK_INPUT_STREAM("\x12\x34\x56\x78\x9A\xBC", 6, BIT_LITTLE_ENDIAN | BYTE_LITTLE_ENDIAN);
g_check_cmp_int64(h_read_bits(&is, 31, false), ==, 0x78563412);
g_check_cmp_int64(h_read_bits(&is, 17, false), ==, 0x17934);
}
{
HInputStream is = MK_INPUT_STREAM("\x12\x34\x56\x78\x9A\xBC", 6, BIT_LITTLE_ENDIAN | BYTE_LITTLE_ENDIAN);
g_check_cmp_int64(h_read_bits(&is, 33, false), ==, 0x78563412);
g_check_cmp_int64(h_read_bits(&is, 17, false), ==, 0x5E4D);
}
{
HInputStream is = MK_INPUT_STREAM("\x12\x34\x56\x78\x9A\xBC", 6, BIT_LITTLE_ENDIAN | BYTE_LITTLE_ENDIAN);
g_check_cmp_int64(h_read_bits(&is, 36, false), ==, 0xA78563412);
g_check_cmp_int64(h_read_bits(&is, 12, false), ==, 0xBC9);
}
{
HInputStream is = MK_INPUT_STREAM("\x12\x34\x56\x78\x9A\xBC", 6, BIT_LITTLE_ENDIAN | BYTE_LITTLE_ENDIAN);
g_check_cmp_int64(h_read_bits(&is, 40, false), ==, 0x9A78563412);
g_check_cmp_int64(h_read_bits(&is, 8, false), ==, 0xBC);
}
{
HInputStream is = MK_INPUT_STREAM("\x12\x34\x56\x78\x9A\xBC", 6, BIT_LITTLE_ENDIAN | BYTE_LITTLE_ENDIAN);
g_check_cmp_int64(h_read_bits(&is, 48, false), ==, 0xBC9A78563412);
}
}
void register_regression_tests(void) {
g_test_add_func("/core/regression/bug118", test_bug118);
g_test_add_func("/core/regression/seq_index_path", test_seq_index_path);
g_test_add_func("/core/regression/read_bits_48", test_read_bits_48);
}

1
src/test_suite.h
View file

@ -212,6 +212,7 @@
#define g_check_cmp_int(n1, op, n2) g_check_inttype("%d", int, n1, op, n2)
#define g_check_cmp_int32(n1, op, n2) g_check_inttype("%d", int32_t, n1, op, n2)
#define g_check_cmp_int64(n1, op, n2) g_check_inttype("%" PRId64, int64_t, n1, op, n2)
#define g_check_cmp_uint32(n1, op, n2) g_check_inttype("%u", uint32_t, n1, op, n2)