diff --git a/gen_intrange.c b/gen_intrange.c index fb5511b31f7bce1fb0f63c9248df75877b780576..ae82fded3f65bb7035fb0857d43ef6e40a5aea4f 100644 --- a/gen_intrange.c +++ b/gen_intrange.c @@ -27,7 +27,8 @@ struct charset * new_charset(void) { return (struct charset *) calloc(sizeof(struct charset), 1); } -void print_charset(struct charset *cs) { +void print_charset(struct charset *cs, int depth) { + printf("current byte index = %d ", depth); for (int i = 0; i<32; i++) { printf("%hhx ",cs->bitmap[i]); @@ -36,8 +37,8 @@ void print_charset(struct charset *cs) { } -void HCFS_ADD_CHARSET(struct charset *cs) { - print_charset(cs); +void HCFS_ADD_CHARSET(struct charset *cs, int depth) { + print_charset(cs, depth); } void HCFS_BEGIN_CHOICE(void) { @@ -59,10 +60,10 @@ void HCFS_END_SEQ(void) { printf("END SEQ\n"); } -void HCFS_ADD_CHAR(uint8_t chr) { +void HCFS_ADD_CHAR(uint8_t chr, int depth) { struct charset *tcs = new_charset(); charset_set(tcs, chr, 1); - print_charset(tcs); + print_charset(tcs, depth); } @@ -81,19 +82,20 @@ void HCFS_ADD_CHAR(uint8_t chr) { // we'll implement it first as just an array of arrays haha -struct charset reorder_matchlines[8][8]; +struct charset matchlines[8][8]; // branch on choices -copy past stuff up to byte index as necessary -do it without allocs first +//copy past stuff up to byte index as necessary +//do it without allocs first void gen_int_range(uint64_t low, uint64_t high, uint8_t bytes, uint8_t starting_byte_index) { uint8_t current_byte_index = starting_byte_index; + uint8_t matchline_index = 0; // Possible FIXME: TallerThanMe if (1 == bytes) { struct charset *cs = new_charset();