diff --git a/src/huffman/construct_tree.asm b/src/huffman/construct_tree.asm index 0fb5996..635fe74 100644 --- a/src/huffman/construct_tree.asm +++ b/src/huffman/construct_tree.asm @@ -198,22 +198,21 @@ _huff_construct_tree: call huff_print_arr_nodes ; asmr - ; {bits: -0, NumBits: -1, Leafs: [4294967295, -4294901761], Symbol: -0} - ; {bits: -0, NumBits: -1, Leafs: [4294967295, 131071], Symbol: 1} - ; {bits: 0, NumBits: 0, Leafs: [511, 131072], Symbol: 2} - ; {bits: 0, NumBits: 0, Leafs: [66046, 196609], Symbol: 3} - ; {bits: 0, NumBits: 0, Leafs: [131581, 262146], Symbol: 4} - ; {bits: 0, NumBits: 0, Leafs: [197116, 327683], Symbol: 5} + ; {bits: 0, NumBits: 4294967295, Leafs: [65535, 65535], Symbol: 65280} + ; {bits: 0, NumBits: 4294967295, Leafs: [65535, 65535], Symbol: 65281} + ; {bits: 0, NumBits: 0, Leafs: [511, 0], Symbol: 2} + ; {bits: 0, NumBits: 0, Leafs: [510, 1], Symbol: 3} + ; {bits: 0, NumBits: 0, Leafs: [509, 2], Symbol: 4} + ; {bits: 0, NumBits: 0, Leafs: [508, 3], Symbol: 5} ; [..] - ; {bits: 0, NumBits: 0, Leafs: [16253191, 16384248], Symbol: 250} - ; {bits: 0, NumBits: 0, Leafs: [16318726, 16449785], Symbol: 251} - ; {bits: 0, NumBits: 0, Leafs: [16384261, 16515322], Symbol: 252} - ; {bits: 0, NumBits: 0, Leafs: [16449796, 16580859], Symbol: 253} - ; {bits: 0, NumBits: 0, Leafs: [16515331, 16646396], Symbol: 254} - ; {bits: 0, NumBits: 0, Leafs: [16580866, 16711933], Symbol: 255} - ; {bits: 0, NumBits: 0, Leafs: [16646401, 254], Symbol: 0} - ; {bits: 0, NumBits: 0, Leafs: [16711936, 255], Symbol: 0} - ; {bits: 0, NumBits: 0, Leafs: [0, 0], Symbol: 0} + ; {bits: 0, NumBits: 0, Leafs: [263, 248], Symbol: 250} + ; {bits: 0, NumBits: 0, Leafs: [262, 249], Symbol: 251} + ; {bits: 0, NumBits: 0, Leafs: [261, 250], Symbol: 252} + ; {bits: 0, NumBits: 0, Leafs: [260, 251], Symbol: 253} + ; {bits: 0, NumBits: 0, Leafs: [259, 252], Symbol: 254} + ; {bits: 0, NumBits: 0, Leafs: [258, 253], Symbol: 255} + ; {bits: 0, NumBits: 0, Leafs: [257, 254], Symbol: 0} + ; {bits: 0, NumBits: 0, Leafs: [256, 255], Symbol: 0} ; {bits: 0, NumBits: 0, Leafs: [0, 0], Symbol: 0} ; {bits: 0, NumBits: 0, Leafs: [0, 0], Symbol: 0} ; {bits: 0, NumBits: 0, Leafs: [0, 0], Symbol: 0} diff --git a/src/huffman/print_structs.asm b/src/huffman/print_structs.asm index e76ba0a..8d3771e 100644 --- a/src/huffman/print_structs.asm +++ b/src/huffman/print_structs.asm @@ -86,31 +86,36 @@ huff_print_struct_cnode: call print_open_curly call _huff_print_field_bits - mov rax, [rsi+HUFF_CNODE_BITS_OFFSET] + mov rax, 0 + mov eax, [rsi+HUFF_CNODE_BITS_OFFSET] call print_int32 call print_comma call print_space call _huff_print_field_num_bits - mov rax, [rsi+HUFF_CNODE_NUM_BITS_OFFSET] + mov rax, 0 + mov eax, [rsi+HUFF_CNODE_NUM_BITS_OFFSET] call print_int32 call print_comma call print_space call _huff_print_field_leafs call print_open_bracket - mov rax, [rsi+HUFF_CNODE_LEAF_0_OFFSET] + mov rax, 0 + mov ax, [rsi+HUFF_CNODE_LEAF_0_OFFSET] call print_int32 call print_comma call print_space - mov rax, [rsi+HUFF_CNODE_LEAF_1_OFFSET] + mov rax, 0 + mov ax, [rsi+HUFF_CNODE_LEAF_1_OFFSET] call print_int32 call print_close_bracket call print_comma call print_space call _huff_print_field_symbol - mov rax, [rsi+HUFF_CNODE_SYMBOL_OFFSET] + mov al, 0 + mov al, [rsi+HUFF_CNODE_SYMBOL_OFFSET] call print_int32 call print_close_curly