lsc
/
smol
mirror of https://github.com/Shizmob/smol
2
0
Fork 0
Code Issues Releases Wiki Activity

fix dnload version

This commit is contained in:
PoroCYon 2019-04-30 01:39:48 +02:00
parent 04b2d837bd
commit 070533b07b
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rt/loader32.asm
View File

@ -2,8 +2,7 @@
%include "rtld.inc"
; TODO
%define R10_BIAS (0)
%define R10_BIAS (0x178)
%ifdef ELF_TYPE
[section .text.startup.smol]
@ -43,7 +42,7 @@ _smol_start:
%endif
%ifdef USE_DNLOAD_LOADER
; TODO: borked!
push eax
pop ebp
pop edi
@ -165,7 +164,6 @@ _smol_start:
; if USE_DNLOAD_LOADER
%else
;.loopme: jmp short .loopme
mov [_smol_linkmap], eax
@ -176,7 +174,8 @@ _smol_start:
mov eax, _smol_start
repne scasd
sub edi, ebx
sub edi, LM_ENTRY_OFFSET_BASE+4
;sub edi, LM_ENTRY_OFFSET_BASE+4-R10_BIAS
add edi, R10_BIAS-LM_ENTRY_OFFSET_BASE-4
mov [_smol_linkoff], edi
pop edi ; _symbols
@ -204,19 +203,19 @@ repne scasd
push ecx
push ecx
pop eax
mov ecx, [esi + LF_NBUCKETS_OFF]
mov ecx, [esi + LF_NBUCKETS_OFF - R10_BIAS]
xor edx, edx
div ecx
pop ecx
shr ecx, 1
; ebx: bucket
mov ebx, [esi + LF_GNU_BUCKETS_OFF]
mov ebx, [esi + LF_GNU_BUCKETS_OFF - R10_BIAS]
mov ebx, [ebx + edx * 4]
.next_chain:
; edx: luhash
mov edx, [esi + LF_GNU_CHAIN_ZERO_OFF]
mov edx, [esi + LF_GNU_CHAIN_ZERO_OFF - R10_BIAS]
mov edx, [edx + ebx * 4]
; ecx: hash
@ -250,6 +249,8 @@ repne scasd
cmp word [edi], 0
jne short .next_hash
pop eax ; get rid of leftover ecx on stack
; if USE_DNLOAD_LOADER ... else ...
%endif