janis/from-scratch
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fixes

Browse source
This commit is contained in:
janis 2026-07-09 14:17:15 +02:00
parent c48c4261da
commit 2f7282577a
Signed by: janis
SSH key fingerprint: SHA256:bB1qbbqmDXZNT0KKD5c2Dfjg53JGhj7B3CFcLIzSqq8
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
stages/as0/as0.asm
View file

@ -1884,7 +1884,7 @@ encode_inst:
call write_non_zero_bytes call write_non_zero_bytes
pop rax pop rax
shl eax, 6 shr eax, 6
dec eax dec eax
cmp eax, 2 cmp eax, 2
jge .imm jge .imm
@ -1937,11 +1937,11 @@ write_imm:
jmp write_bytes jmp write_bytes
write_disp: write_disp:
cmp edi, 0xff cmp edi, 0xff ; if disp > 0xff, write 4 bytes, else write 1 byte
seta sil seta sil
shl sil, 1 movzx esi, sil
inc sil lea esi, [rsi + rsi * 2]
movzx rsi, sil inc esi
jmp write_bytes jmp write_bytes
write_bytes: write_bytes:
@ -1986,8 +1986,8 @@ compute_modrm_sib:
je .done_mem je .done_mem
and eax, 0x37 ; clear mod bits, mod = 00b and eax, 0x37 ; clear mod bits, mod = 00b
cmp dword [rsi + operand.type], KIND_MEM test dword [rsi + operand.type], KIND_MEM
jne .done_mem jz .done_mem
cmp dword [rsi + operand.disp], 0 cmp dword [rsi + operand.disp], 0
jne .sib ; mod = 01b or 10b jne .sib ; mod = 01b or 10b
@ -2023,7 +2023,7 @@ compute_modrm_sib:
mov ecx, dword [rsi + operand.index + register.num] mov ecx, dword [rsi + operand.index + register.num]
cmp ecx, -1 cmp ecx, -1
jne .done_mem je .done_mem
and ecx, 7 and ecx, 7
shl ecx, 3 ; index bits shl ecx, 3 ; index bits
@ -2154,8 +2154,8 @@ struc LabelTable
endstruc endstruc
section .data section .data
labels dq 0 labels dq 0, 0
label_refs dq 0 label_refs dq 0, 0
section .text section .text
;; calculates the hash of a byte sequence in $rdi of length $rsi, returning it in $eax ;; calculates the hash of a byte sequence in $rdi of length $rsi, returning it in $eax
@ -2174,6 +2174,7 @@ fasthash:
.done: .done:
ret ret
global init_label_tables
init_label_tables: init_label_tables:
mov edi, 0x100 mov edi, 0x100
mov esi, 8 mov esi, 8
@ -2199,19 +2200,19 @@ push_lbl_ref_by_hash:
push r12 push r12
push r13 push r13
mov rbx, [rel label_refs] lea rbx, [rel label_refs]
mov r13d, esi ; label offset mov r13d, esi ; label offset
mov r12d, edi ; label hash mov r12d, edi ; label hash
jmp push_lbl_common.hash_in_r12d jmp push_lbl_common.hash_in_r12d
;; push label $rdi with length $rsi and offset $rdx into the label ref table ;; push label $rdi with length $rsi and offset $rdx into the label ref table
push_lbl_ref: push_lbl_ref:
mov rcx, [rel label_refs] lea rcx, [rel label_refs]
jmp push_lbl_common jmp push_lbl_common
;; push label $rdi with length $rsi and offset $edx into the label table ;; push label $rdi with length $rsi and offset $edx into the label table
push_lbl: push_lbl:
mov rcx, [rel labels] lea rcx, [rel labels]
push_lbl_common: push_lbl_common:
push rbx push rbx
push r12 push r12
@ -2255,7 +2256,7 @@ find_lbl:
push r12 push r12
push r13 push r13
mov rbx, [rel labels] lea rbx, [rel labels]
call fasthash call fasthash
mov r12d, eax ; store the hash in r12d mov r12d, eax ; store the hash in r12d

8
stages/as0/test.rs
View file

@ -14,6 +14,8 @@ unsafe extern "C" {
#[link_name = "encode_inst"] #[link_name = "encode_inst"]
unsafe fn encode_inst_impl(_: *mut Instruction) -> usize; unsafe fn encode_inst_impl(_: *mut Instruction) -> usize;
unsafe fn init_label_tables();
unsafe fn fasthash(_: *const u8, _: usize) -> u32; unsafe fn fasthash(_: *const u8, _: usize) -> u32;
#[link_name = "buf"] #[link_name = "buf"]
@ -143,6 +145,9 @@ impl Register {
} }
} }
static mut TABLES_INIT: std::cell::LazyCell<()> =
std::cell::LazyCell::new(|| unsafe { init_label_tables() });
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
@ -157,7 +162,8 @@ mod tests {
#[test] #[test]
fn parse_inst() { fn parse_inst() {
let res = Instruction::parse(b"mov byte [rax], 4\0"); _ = unsafe { *TABLES_INIT };
let res = Instruction::parse(b"mov byte ['rax], 4\0");
// assert_eq!( // assert_eq!(
// res, // res,
// Some(( // Some((