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.

Sign up for GitHub

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

Fix dictionary look up bug #80

Merged
merged 3 commits into from
Jul 13, 2024
Merged

Fix dictionary look up bug #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8454d0a
WIP
jbirddog Jul 13, 2024
f2bf998
WIP
jbirddog Jul 13, 2024
fef777e
WIP
jbirddog Jul 13, 2024
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
2 changes: 2 additions & 0 deletions defs.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ _AL = REG_RAX or _BYTE
_EAX = REG_RAX or _DWORD
_RAX = REG_RAX or _QWORD

_ECX = REG_RCX or _DWORD

_blue:
.tib dq 0
.tib_len dd 0
Expand Down
20 changes: 17 additions & 3 deletions dictionary.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ macro _ose e {
_core_words:
.prev_word = 0

_wi 'ecx', 3, se_reg_ecx, 0, 0
_wi 'eax', 3, se_reg_eax, 0, 0

.se_reg_latest = .prev_word
Expand Down Expand Up @@ -146,9 +147,9 @@ _find_from:
jne .next

inc rdi
dec ecx
js .check_word
dec cl
jnz .check_word

pop rax
jmp .done

Expand Down Expand Up @@ -426,3 +427,16 @@ se_reg_eax:
stosb

ret

se_reg_ecx:
mov rax, _ECX
mov rdi, [_dictionary.here]
stosq

mov rdi, [_dictionary.latest]
add rdi, 2
mov al, byte [rdi]
inc al
stosb

ret
24 changes: 24 additions & 0 deletions dictionary_test.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,24 @@ macro tc2 word, in_len, word_len {
ok
}

macro tc3 word, from {
mov [_blue.tib], _core_words.##word + _dictionary.word_offset
mov [_blue.tib_len], _core_words.##word + 1
mov [_blue.tib_in], 0

t 'finds the expected word'

call parser_next_word

mov rdi, from
call _find_from

cmp rax, _core_words.##word
jne failure

ok
}

dictionary_test:
call dictionary_init

Expand Down Expand Up @@ -141,6 +159,12 @@ dictionary_test:
tc1 word_d_comma, 2, _core_words.d_comma
tc1 word_q_comma, 2, _core_words.q_comma
tc1 word_base, 4, _core_words.base

tc3 seX_o_parse, _core_words.se_parse_latest
tc3 seX_parse_end, _core_words.se_parse_latest

tc3 se_reg_eax, _core_words.se_reg_latest
tc3 se_reg_ecx, _core_words.se_reg_latest

call dictionary_deinit

Expand Down
Loading