andrius
/
stage0-uefi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allocate more memory in cc_amd64, without it it tends to hang when building M2-Planet.

This commit is contained in:
Andrius Štikonas 2022-10-10 23:43:36 +01:00
parent 21262116e0
commit 9a6c1a0efa
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
amd64/Development/cc_amd64.S
View File

@ -115,15 +115,15 @@ loop_options_done:
call [rcx+8] # rootdir->open()
add rsp, 48 # deallocate stack
# Allocate ourselves 16 MiB of memory
mov rdx, 0x1000000 # allocate 16 MiB of memory for malloc pool
# Allocate ourselves 64 MiB of memory
mov rdx, 0x4000000 # allocate 64 MiB of memory for malloc pool
call allocate_pool # allocate memory
mov [rip+malloc_pointer], rax # save malloc pointer
mov [rip+malloc_pool], rax # save the beginning of malloc pool
# Zero allocated memory buffer
add rax, 0x1000000 # end of malloc area
add rax, 0x4000000 # end of malloc area
zero_loop:
dec rax # next byte
mov BYTE PTR [rax], 0 # zero it
@ -133,7 +133,7 @@ zero_loop:
# cc_amd64 needs quite a lot of stack space when building M2-Planet
# which is not guaranteed to be available on UEFI (it guarantees at least 128 KiB).
# Therefore we will allocate an extra space on heap and use part of it for user stack
mov rax, 0x400000 # Allocate 4 MiB for user stack
mov rax, 0x800000 # Allocate 8 MiB for user stack
call malloc
mov [rip+user_stack], rax # Save user stack
call exit_uefi_stack # Switch to user stack
@ -250,7 +250,7 @@ fix_types_done:
# read_all_tokens function
# Receives FILE* in R15 and Token_List* in RAX
# Receives Token_List* in RAX
# Tokenizes all input and returns updated list in RAX
# Returns TOKEN in RAX
# Uses RAX for C
@ -268,7 +268,7 @@ read_all_tokens_done:
# get_token function
# Receives INT in RAX and FILE* in R15
# Receives INT in RAX
# Makes a list of TOKEN_LIST
# C and STRING_INDEX are stored in memory, RCX is used for S and RDX is used for current
# Returns C in RAX
@ -641,8 +641,7 @@ fgetc:
mov rcx, [rip+fin] # arg1 = fin
push 1 # size = 1
mov rdx, rsp # arg2 = &size
mov rsi, 0 # zero rsi
push rsi # allocate stack
push 0 # zero rsi
mov r8, rsp # arg3 = &input
sub rsp, 24 # allocate shadow stack space for UEFI function
call [rcx+32] # fin->read()

15
amd64/cc_amd64.M1
View File

@ -299,15 +299,15 @@ DEFINE NULL 0000000000000000
call_[rcx+BYTE] !8 # rootdir->open()
add_rsp, %48 # deallocate stack
# Allocate ourselves 16 MiB of memory
mov_rdx, %0x1000000 # allocate 16 MiB of memory for malloc pool
# Allocate ourselves 64 MiB of memory
mov_rdx, %0x4000000 # allocate 64 MiB of memory for malloc pool
call %allocate_pool # allocate memory
mov_[rip+DWORD],rax %malloc_pointer # save malloc pointer
mov_[rip+DWORD],rax %malloc_pool # save the beginning of malloc pool
# Zero allocated memory buffer
add_rax, %0x1000000 # end of malloc area
add_rax, %0x4000000 # end of malloc area
:zero_loop
dec_rax # next byte
mov_[rax], !0 # zero it
@ -317,7 +317,7 @@ DEFINE NULL 0000000000000000
# cc_amd64 needs quite a lot of stack space when building M2-Planet
# which is not guaranteed to be available on UEFI (it guarantees at least 128 KiB).
# Therefore we will allocate an extra space on heap and use part of it for user stack
mov_rax, %0x400000 # Allocate 4 MiB for user stack
mov_rax, %0x800000 # Allocate 8 MiB for user stack
call %malloc
mov_[rip+DWORD],rax %user_stack # Save user stack
call %exit_uefi_stack # Switch to user stack
@ -453,7 +453,7 @@ DEFINE NULL 0000000000000000
# read_all_tokens function
# Receives FILE* in R15 and Token_List* in RAX
# Receives Token_List* in RAX
# Tokenizes all input and returns updated list in RAX
# Returns TOKEN in RAX
# Uses RAX for C
@ -471,7 +471,7 @@ DEFINE NULL 0000000000000000
# get_token function
# Receives INT in RAX and FILE* in R15
# Receives INT in RAX
# Makes a list of TOKEN_LIST
# C and STRING_INDEX are stored in memory, RCX is used for S and RDX is used for current
# Returns C in RAX
@ -849,8 +849,7 @@ DEFINE NULL 0000000000000000
mov_rcx,[rip+DWORD] %fin # arg1 = fin
push !1 # size = 1
mov_rdx,rsp # arg2 = &size
mov_rsi, %0 # zero rsi
push_rsi # allocate stack
push !0 # allocate stack
mov_r8,rsp # arg3 = &input
sub_rsp, %24 # allocate shadow stack space for UEFI function
call_[rcx+BYTE] !32 # fin->read()