bumbread
/
ciabatta
mirror of https://github.com/flysand7/ciabatta.git
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SSE by aligning the stack

This commit is contained in:
flysand7 2023-08-05 22:20:20 +11:00
parent 35717f62a0
commit 50fe56949f
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.py
View File

@ -72,7 +72,7 @@ dependencies.append(args.compiler)
includes = ['src/include'] includes = ['src/include']
cc = args.compiler cc = args.compiler
cc_defines = [] cc_defines = []
cc_flags = ['-nostdlib', '-fno-stack-protector', '-mno-sse'] cc_flags = ['-nostdlib', '-fno-stack-protector']
crt_file = 'crt.lib' crt_file = 'crt.lib'
lib_file = 'cia.lib' lib_file = 'cia.lib'
dl_file = 'ld-cia.so' dl_file = 'ld-cia.so'
@ -272,7 +272,7 @@ dl_lib = f'lib/{dl_file}'
dl_flags = [ dl_flags = [
'-shared', '-shared',
'-nostdlib', '-nostdlib',
'-mno-sse', # '-mno-sse',
'-ffreestanding', '-ffreestanding',
'-fno-stack-protector', '-fno-stack-protector',
'-Wl,-e,_dlstart', '-Wl,-e,_dlstart',
@ -292,7 +292,6 @@ if target == 'linux':
print_step(f'Compiling {crt_file}\n') print_step(f'Compiling {crt_file}\n')
if target == 'linux': if target == 'linux':
# assemble('src/linux/crt-entry.asm', 'bin/crt-entry.o')
compile(['src/linux/crt-ctors.c'], 'bin/crt-ctors.o', '-c') compile(['src/linux/crt-ctors.c'], 'bin/crt-ctors.o', '-c')
archive(['bin/crt-ctors.o'], crt_lib) archive(['bin/crt-ctors.o'], crt_lib)
elif target == 'windows': elif target == 'windows':

2
src/linux/entry.c
View File

@ -14,7 +14,7 @@ void __stack_chk_fail(void) {
extern int main(int argc, char **argv, char **envp); extern int main(int argc, char **argv, char **envp);
static void _fileapi_init(); static void _fileapi_init();
void _start() { void _cia_start() {
// Get the envp // Get the envp
// char **envp = argv + (argc + 1); // char **envp = argv + (argc + 1);
// init(argc, argv, envp); // init(argc, argv, envp);

5
src/loader/loader-entry.asm
View File

@ -11,3 +11,8 @@ _dlstart:
mov rdi, rsp mov rdi, rsp
lea rsi, _DYNAMIC lea rsi, _DYNAMIC
and rsp, -16 and rsp, -16
; `call` pushes 8-byte value onto the stack
; by pushing an 8-bit value ourselves we can make
; sure the stack is aligned after rbp push in prologue
sub rsp, 8