diff --git a/lib/csu/amd64/Scrt1.s b/lib/csu/amd64/Scrt1.s deleted file mode 100644 index 8b20894..0000000 --- a/lib/csu/amd64/Scrt1.s +++ /dev/null @@ -1,262 +0,0 @@ - .text - .file "/ubixos/usr/src/lib/csu/amd64/crt1.c" - # Start of file scope inline assembly - .ident "$FreeBSD: releng/11.1/lib/csu/amd64/crt1.c 292000 2015-12-08 19:32:58Z emaste $" - .ident "$FreeBSD: releng/11.1/lib/csu/common/crtbrand.c 321309 2017-07-20 23:39:50Z gjb $" - .ident "$FreeBSD: releng/11.1/lib/csu/common/ignore_init.c 245133 2013-01-07 17:58:27Z kib $" - - # End of file scope inline assembly - .globl _start - .p2align 4, 0x90 - .type _start,@function -_start: # @_start - .cfi_startproc -# BB#0: - pushq %rbp -.Lcfi0: - .cfi_def_cfa_offset 16 -.Lcfi1: - .cfi_offset %rbp, -16 - movq %rsp, %rbp -.Lcfi2: - .cfi_def_cfa_register %rbp - pushq %r15 - pushq %r14 - pushq %r13 - pushq %r12 - pushq %rbx - pushq %rax -.Lcfi3: - .cfi_offset %rbx, -56 -.Lcfi4: - .cfi_offset %r12, -48 -.Lcfi5: - .cfi_offset %r13, -40 -.Lcfi6: - .cfi_offset %r14, -32 -.Lcfi7: - .cfi_offset %r15, -24 - movq (%rdi), %r13 - movslq %r13d, %rax - leaq 16(%rdi,%rax,8), %rax - movq %rax, -48(%rbp) # 8-byte Spill - movq environ@GOTPCREL(%rip), %rax - cmpq $0, (%rax) - jne .LBB0_2 -# BB#1: - movq -48(%rbp), %rcx # 8-byte Reload - movq %rcx, (%rax) -.LBB0_2: - addq $8, %rdi - testl %r13d, %r13d - jle .LBB0_10 -# BB#3: - movq (%rdi), %rax - testq %rax, %rax - je .LBB0_10 -# BB#4: - movq __progname@GOTPCREL(%rip), %rcx - jmp .LBB0_5 - .p2align 4, 0x90 -.LBB0_9: # in Loop: Header=BB0_5 Depth=1 - incq %rax -.LBB0_5: # =>This Loop Header: Depth=1 - # Child Loop BB0_6 Depth 2 - movq %rax, (%rcx) - jmp .LBB0_6 - .p2align 4, 0x90 -.LBB0_8: # in Loop: Header=BB0_6 Depth=2 - incq %rax -.LBB0_6: # Parent Loop BB0_5 Depth=1 - # => This Inner Loop Header: Depth=2 - movzbl (%rax), %edx - cmpb $47, %dl - je .LBB0_9 -# BB#7: # in Loop: Header=BB0_6 Depth=2 - testb %dl, %dl - jne .LBB0_8 -.LBB0_10: - movq %rdi, %r15 - cmpq $0, _DYNAMIC@GOTPCREL(%rip) - je .LBB0_12 -# BB#11: - movq %rsi, %rdi - callq atexit@PLT - cmpq $0, _DYNAMIC@GOTPCREL(%rip) - je .LBB0_14 - jmp .LBB0_24 -.LBB0_12: - callq _init_tls@PLT - cmpq $0, _DYNAMIC@GOTPCREL(%rip) - jne .LBB0_24 -.LBB0_14: - leaq finalizer(%rip), %rdi - callq atexit@PLT - leaq __preinit_array_start(%rip), %r12 - leaq __preinit_array_end(%rip), %rax - subq %r12, %rax - movq %rax, %rcx - sarq $63, %rcx - shrq $61, %rcx - addq %rax, %rcx - sarq $3, %rcx - movq %r15, %r14 - movq %r13, %r15 - movq %rcx, %r13 - je .LBB0_19 -# BB#15: - xorl %ebx, %ebx - .p2align 4, 0x90 -.LBB0_16: # =>This Inner Loop Header: Depth=1 - movq (%r12), %rax - cmpq $2, %rax - jb .LBB0_18 -# BB#17: # in Loop: Header=BB0_16 Depth=1 - movl %r15d, %edi - movq %r14, %rsi - movq -48(%rbp), %rdx # 8-byte Reload - callq *%rax -.LBB0_18: # in Loop: Header=BB0_16 Depth=1 - incq %rbx - addq $8, %r12 - cmpq %r13, %rbx - jb .LBB0_16 -.LBB0_19: - movq %r15, %r13 - movq %r14, %r15 - callq _init - leaq __init_array_start(%rip), %rbx - leaq __init_array_end(%rip), %rax - subq %rbx, %rax - movq %rax, %r12 - sarq $63, %r12 - shrq $61, %r12 - addq %rax, %r12 - sarq $3, %r12 - je .LBB0_24 -# BB#20: - xorl %r14d, %r14d - .p2align 4, 0x90 -.LBB0_21: # =>This Inner Loop Header: Depth=1 - movq (%rbx), %rax - cmpq $2, %rax - jb .LBB0_23 -# BB#22: # in Loop: Header=BB0_21 Depth=1 - movl %r13d, %edi - movq %r15, %rsi - movq -48(%rbp), %rdx # 8-byte Reload - callq *%rax -.LBB0_23: # in Loop: Header=BB0_21 Depth=1 - incq %r14 - addq $8, %rbx - cmpq %r12, %r14 - jb .LBB0_21 -.LBB0_24: - movl %r13d, %edi - movq %r15, %rsi - movq -48(%rbp), %rdx # 8-byte Reload - callq main@PLT - movl %eax, %edi - callq exit@PLT -.Lfunc_end0: - .size _start, .Lfunc_end0-_start - .cfi_endproc - - .p2align 4, 0x90 - .type finalizer,@function -finalizer: # @finalizer - .cfi_startproc -# BB#0: - pushq %rbp -.Lcfi8: - .cfi_def_cfa_offset 16 -.Lcfi9: - .cfi_offset %rbp, -16 - movq %rsp, %rbp -.Lcfi10: - .cfi_def_cfa_register %rbp - pushq %r14 - pushq %rbx -.Lcfi11: - .cfi_offset %rbx, -32 -.Lcfi12: - .cfi_offset %r14, -24 - leaq __fini_array_start(%rip), %r14 - leaq __fini_array_end(%rip), %rax - subq %r14, %rax - movq %rax, %rbx - sarq $63, %rbx - shrq $61, %rbx - addq %rax, %rbx - sarq $3, %rbx - je .LBB1_3 - .p2align 4, 0x90 -.LBB1_1: # =>This Inner Loop Header: Depth=1 - movq -8(%r14,%rbx,8), %rax - decq %rbx - cmpq $1, %rax - jbe .LBB1_2 -# BB#4: # in Loop: Header=BB1_1 Depth=1 - callq *%rax -.LBB1_2: # in Loop: Header=BB1_1 Depth=1 - testq %rbx, %rbx - jne .LBB1_1 -.LBB1_3: - popq %rbx - popq %r14 - popq %rbp - jmp _fini # TAILCALL -.Lfunc_end1: - .size finalizer, .Lfunc_end1-finalizer - .cfi_endproc - - .type abitag,@object # @abitag - .section .note.tag,"a",@note - .p2align 2 -abitag: - .long 8 # 0x8 - .long 4 # 0x4 - .long 1 # 0x1 - .asciz "FreeBSD" - .long 1101001 # 0x10ccc9 - .size abitag, 24 - - .type .L.str,@object # @.str - .section .rodata.str1.1,"aMS",@progbits,1 -.L.str: - .zero 1 - .size .L.str, 1 - - .type __progname,@object # @__progname - .data - .globl __progname - .p2align 3 -__progname: - .quad .L.str - .size __progname, 8 - - .type crt_noinit_tag,@object # @crt_noinit_tag - .section .note.tag,"a",@note - .p2align 2 -crt_noinit_tag: - .long 8 # 0x8 - .long 4 # 0x4 - .long 2 # 0x2 - .asciz "FreeBSD" - .long 0 # 0x0 - .size crt_noinit_tag, 24 - - .type environ,@object # @environ - .comm environ,8,8 - .hidden __preinit_array_end - .hidden __preinit_array_start - .hidden __init_array_end - .hidden __init_array_start - .hidden __fini_array_end - .hidden __fini_array_start - .hidden _init - .hidden _fini - .weak _DYNAMIC - - .ident "FreeBSD clang version 4.0.0 (tags/RELEASE_400/final 297347) (based on LLVM 4.0.0)" - .section ".note.GNU-stack","",@progbits diff --git a/lib/csu/amd64/crt1.s b/lib/csu/amd64/crt1.s deleted file mode 100644 index eb7a2c3..0000000 --- a/lib/csu/amd64/crt1.s +++ /dev/null @@ -1,274 +0,0 @@ - .text - .file "/ubixos/usr/src/lib/csu/amd64/crt1.c" - # Start of file scope inline assembly - .ident "$FreeBSD: releng/11.1/lib/csu/amd64/crt1.c 292000 2015-12-08 19:32:58Z emaste $" - .ident "$FreeBSD: releng/11.1/lib/csu/common/crtbrand.c 321309 2017-07-20 23:39:50Z gjb $" - .ident "$FreeBSD: releng/11.1/lib/csu/common/ignore_init.c 245133 2013-01-07 17:58:27Z kib $" - - # End of file scope inline assembly - .globl _start - .p2align 4, 0x90 - .type _start,@function -_start: # @_start - .cfi_startproc -# BB#0: - pushq %rbp -.Lcfi0: - .cfi_def_cfa_offset 16 -.Lcfi1: - .cfi_offset %rbp, -16 - movq %rsp, %rbp -.Lcfi2: - .cfi_def_cfa_register %rbp - pushq %r15 - pushq %r14 - pushq %r13 - pushq %r12 - pushq %rbx - pushq %rax -.Lcfi3: - .cfi_offset %rbx, -56 -.Lcfi4: - .cfi_offset %r12, -48 -.Lcfi5: - .cfi_offset %r13, -40 -.Lcfi6: - .cfi_offset %r14, -32 -.Lcfi7: - .cfi_offset %r15, -24 - movq %rdi, %r14 - movq (%r14), %r15 - movslq %r15d, %rax - leaq 16(%r14,%rax,8), %r13 - cmpq $0, environ(%rip) - jne .LBB0_2 -# BB#1: - movq %r13, environ(%rip) -.LBB0_2: - addq $8, %r14 - testl %r15d, %r15d - jle .LBB0_9 -# BB#3: - movq (%r14), %rax - testq %rax, %rax - jne .LBB0_4 - jmp .LBB0_9 - .p2align 4, 0x90 -.LBB0_8: # in Loop: Header=BB0_4 Depth=1 - incq %rax -.LBB0_4: # =>This Loop Header: Depth=1 - # Child Loop BB0_5 Depth 2 - movq %rax, __progname(%rip) - jmp .LBB0_5 - .p2align 4, 0x90 -.LBB0_7: # in Loop: Header=BB0_5 Depth=2 - incq %rax -.LBB0_5: # Parent Loop BB0_4 Depth=1 - # => This Inner Loop Header: Depth=2 - movzbl (%rax), %ecx - cmpb $47, %cl - je .LBB0_8 -# BB#6: # in Loop: Header=BB0_5 Depth=2 - testb %cl, %cl - jne .LBB0_7 -.LBB0_9: - movl $_DYNAMIC, %eax - testq %rax, %rax - je .LBB0_11 -# BB#10: - movq %rsi, %rdi - callq atexit - jmp .LBB0_12 -.LBB0_11: - callq _init_tls -.LBB0_12: - movl $_DYNAMIC, %eax - testq %rax, %rax - jne .LBB0_23 -# BB#13: - movl $finalizer, %edi - callq atexit - movl $__preinit_array_start, %eax - movl $__preinit_array_end, %ecx - subq %rax, %rcx - movq %rcx, %rax - sarq $63, %rax - shrq $61, %rax - addq %rcx, %rax - sarq $3, %rax - je .LBB0_18 -# BB#14: - xorl %r12d, %r12d - movl $__preinit_array_start, %eax - movl $__preinit_array_end, %ecx - subq %rax, %rcx - movq %rcx, %rbx - sarq $63, %rbx - shrq $61, %rbx - addq %rcx, %rbx - sarq $3, %rbx - .p2align 4, 0x90 -.LBB0_15: # =>This Inner Loop Header: Depth=1 - movq __preinit_array_start(,%r12,8), %rax - cmpq $2, %rax - jb .LBB0_17 -# BB#16: # in Loop: Header=BB0_15 Depth=1 - movl %r15d, %edi - movq %r14, %rsi - movq %r13, %rdx - callq *%rax -.LBB0_17: # in Loop: Header=BB0_15 Depth=1 - incq %r12 - cmpq %rbx, %r12 - jb .LBB0_15 -.LBB0_18: - callq _init - movl $__init_array_start, %eax - movl $__init_array_end, %ecx - subq %rax, %rcx - movq %rcx, %rax - sarq $63, %rax - shrq $61, %rax - addq %rcx, %rax - sarq $3, %rax - je .LBB0_23 -# BB#19: - xorl %ebx, %ebx - movl $__init_array_start, %eax - movl $__init_array_end, %ecx - subq %rax, %rcx - movq %rcx, %r12 - sarq $63, %r12 - shrq $61, %r12 - addq %rcx, %r12 - sarq $3, %r12 - .p2align 4, 0x90 -.LBB0_20: # =>This Inner Loop Header: Depth=1 - movq __init_array_start(,%rbx,8), %rax - cmpq $2, %rax - jb .LBB0_22 -# BB#21: # in Loop: Header=BB0_20 Depth=1 - movl %r15d, %edi - movq %r14, %rsi - movq %r13, %rdx - callq *%rax -.LBB0_22: # in Loop: Header=BB0_20 Depth=1 - incq %rbx - cmpq %r12, %rbx - jb .LBB0_20 -.LBB0_23: - movl %r15d, %edi - movq %r14, %rsi - movq %r13, %rdx - callq main - movl %eax, %edi - callq exit -.Lfunc_end0: - .size _start, .Lfunc_end0-_start - .cfi_endproc - - .p2align 4, 0x90 - .type finalizer,@function -finalizer: # @finalizer - .cfi_startproc -# BB#0: - pushq %rbp -.Lcfi8: - .cfi_def_cfa_offset 16 -.Lcfi9: - .cfi_offset %rbp, -16 - movq %rsp, %rbp -.Lcfi10: - .cfi_def_cfa_register %rbp - pushq %rbx - pushq %rax -.Lcfi11: - .cfi_offset %rbx, -24 - movl $__fini_array_start, %eax - movl $__fini_array_end, %ecx - subq %rax, %rcx - movq %rcx, %rax - sarq $63, %rax - shrq $61, %rax - addq %rcx, %rax - sarq $3, %rax - je .LBB1_4 -# BB#1: - movl $__fini_array_start, %eax - movl $__fini_array_end, %ecx - subq %rax, %rcx - movq %rcx, %rbx - sarq $63, %rbx - shrq $61, %rbx - addq %rcx, %rbx - sarq $3, %rbx - .p2align 4, 0x90 -.LBB1_2: # =>This Inner Loop Header: Depth=1 - movq __fini_array_start-8(,%rbx,8), %rax - decq %rbx - cmpq $1, %rax - jbe .LBB1_3 -# BB#5: # in Loop: Header=BB1_2 Depth=1 - callq *%rax -.LBB1_3: # in Loop: Header=BB1_2 Depth=1 - testq %rbx, %rbx - jne .LBB1_2 -.LBB1_4: - addq $8, %rsp - popq %rbx - popq %rbp - jmp _fini # TAILCALL -.Lfunc_end1: - .size finalizer, .Lfunc_end1-finalizer - .cfi_endproc - - .type abitag,@object # @abitag - .section .note.tag,"a",@note - .p2align 2 -abitag: - .long 8 # 0x8 - .long 4 # 0x4 - .long 1 # 0x1 - .asciz "FreeBSD" - .long 1101001 # 0x10ccc9 - .size abitag, 24 - - .type .L.str,@object # @.str - .section .rodata.str1.1,"aMS",@progbits,1 -.L.str: - .zero 1 - .size .L.str, 1 - - .type __progname,@object # @__progname - .data - .globl __progname - .p2align 3 -__progname: - .quad .L.str - .size __progname, 8 - - .type crt_noinit_tag,@object # @crt_noinit_tag - .section .note.tag,"a",@note - .p2align 2 -crt_noinit_tag: - .long 8 # 0x8 - .long 4 # 0x4 - .long 2 # 0x2 - .asciz "FreeBSD" - .long 0 # 0x0 - .size crt_noinit_tag, 24 - - .type environ,@object # @environ - .comm environ,8,8 - .hidden __preinit_array_end - .hidden __preinit_array_start - .hidden __init_array_end - .hidden __init_array_start - .hidden __fini_array_end - .hidden __fini_array_start - .hidden _init - .hidden _fini - .weak _DYNAMIC - - .ident "FreeBSD clang version 4.0.0 (tags/RELEASE_400/final 297347) (based on LLVM 4.0.0)" - .section ".note.GNU-stack","",@progbits diff --git a/lib/csu/amd64/gcrt1.s b/lib/csu/amd64/gcrt1.s deleted file mode 100644 index 3769bb6..0000000 --- a/lib/csu/amd64/gcrt1.s +++ /dev/null @@ -1,282 +0,0 @@ - .text - .file "/ubixos/usr/src/lib/csu/amd64/crt1.c" - # Start of file scope inline assembly - .ident "$FreeBSD: releng/11.1/lib/csu/amd64/crt1.c 292000 2015-12-08 19:32:58Z emaste $" - .ident "$FreeBSD: releng/11.1/lib/csu/common/crtbrand.c 321309 2017-07-20 23:39:50Z gjb $" - .ident "$FreeBSD: releng/11.1/lib/csu/common/ignore_init.c 245133 2013-01-07 17:58:27Z kib $" - - # End of file scope inline assembly - .globl _start - .p2align 4, 0x90 - .type _start,@function -_start: # @_start - .cfi_startproc -# BB#0: - pushq %rbp -.Lcfi0: - .cfi_def_cfa_offset 16 -.Lcfi1: - .cfi_offset %rbp, -16 - movq %rsp, %rbp -.Lcfi2: - .cfi_def_cfa_register %rbp - pushq %r15 - pushq %r14 - pushq %r13 - pushq %r12 - pushq %rbx - pushq %rax -.Lcfi3: - .cfi_offset %rbx, -56 -.Lcfi4: - .cfi_offset %r12, -48 -.Lcfi5: - .cfi_offset %r13, -40 -.Lcfi6: - .cfi_offset %r14, -32 -.Lcfi7: - .cfi_offset %r15, -24 - movq %rdi, %r14 - movq (%r14), %r15 - movslq %r15d, %rax - leaq 16(%r14,%rax,8), %r13 - cmpq $0, environ(%rip) - jne .LBB0_2 -# BB#1: - movq %r13, environ(%rip) -.LBB0_2: - addq $8, %r14 - testl %r15d, %r15d - jle .LBB0_9 -# BB#3: - movq (%r14), %rax - testq %rax, %rax - jne .LBB0_4 - jmp .LBB0_9 - .p2align 4, 0x90 -.LBB0_8: # in Loop: Header=BB0_4 Depth=1 - incq %rax -.LBB0_4: # =>This Loop Header: Depth=1 - # Child Loop BB0_5 Depth 2 - movq %rax, __progname(%rip) - jmp .LBB0_5 - .p2align 4, 0x90 -.LBB0_7: # in Loop: Header=BB0_5 Depth=2 - incq %rax -.LBB0_5: # Parent Loop BB0_4 Depth=1 - # => This Inner Loop Header: Depth=2 - movzbl (%rax), %ecx - cmpb $47, %cl - je .LBB0_8 -# BB#6: # in Loop: Header=BB0_5 Depth=2 - testb %cl, %cl - jne .LBB0_7 -.LBB0_9: - movl $_DYNAMIC, %eax - testq %rax, %rax - je .LBB0_11 -# BB#10: - movq %rsi, %rdi - callq atexit - jmp .LBB0_12 -.LBB0_11: - callq _init_tls -.LBB0_12: - movl $_mcleanup, %edi - callq atexit - movl $eprol, %edi - movl $etext, %esi - callq monstartup - #APP -eprol: - #NO_APP - movl $_DYNAMIC, %eax - testq %rax, %rax - jne .LBB0_23 -# BB#13: - movl $finalizer, %edi - callq atexit - movl $__preinit_array_start, %eax - movl $__preinit_array_end, %ecx - subq %rax, %rcx - movq %rcx, %rax - sarq $63, %rax - shrq $61, %rax - addq %rcx, %rax - sarq $3, %rax - je .LBB0_18 -# BB#14: - xorl %r12d, %r12d - movl $__preinit_array_start, %eax - movl $__preinit_array_end, %ecx - subq %rax, %rcx - movq %rcx, %rbx - sarq $63, %rbx - shrq $61, %rbx - addq %rcx, %rbx - sarq $3, %rbx - .p2align 4, 0x90 -.LBB0_15: # =>This Inner Loop Header: Depth=1 - movq __preinit_array_start(,%r12,8), %rax - cmpq $2, %rax - jb .LBB0_17 -# BB#16: # in Loop: Header=BB0_15 Depth=1 - movl %r15d, %edi - movq %r14, %rsi - movq %r13, %rdx - callq *%rax -.LBB0_17: # in Loop: Header=BB0_15 Depth=1 - incq %r12 - cmpq %rbx, %r12 - jb .LBB0_15 -.LBB0_18: - callq _init - movl $__init_array_start, %eax - movl $__init_array_end, %ecx - subq %rax, %rcx - movq %rcx, %rax - sarq $63, %rax - shrq $61, %rax - addq %rcx, %rax - sarq $3, %rax - je .LBB0_23 -# BB#19: - xorl %ebx, %ebx - movl $__init_array_start, %eax - movl $__init_array_end, %ecx - subq %rax, %rcx - movq %rcx, %r12 - sarq $63, %r12 - shrq $61, %r12 - addq %rcx, %r12 - sarq $3, %r12 - .p2align 4, 0x90 -.LBB0_20: # =>This Inner Loop Header: Depth=1 - movq __init_array_start(,%rbx,8), %rax - cmpq $2, %rax - jb .LBB0_22 -# BB#21: # in Loop: Header=BB0_20 Depth=1 - movl %r15d, %edi - movq %r14, %rsi - movq %r13, %rdx - callq *%rax -.LBB0_22: # in Loop: Header=BB0_20 Depth=1 - incq %rbx - cmpq %r12, %rbx - jb .LBB0_20 -.LBB0_23: - movl %r15d, %edi - movq %r14, %rsi - movq %r13, %rdx - callq main - movl %eax, %edi - callq exit -.Lfunc_end0: - .size _start, .Lfunc_end0-_start - .cfi_endproc - - .p2align 4, 0x90 - .type finalizer,@function -finalizer: # @finalizer - .cfi_startproc -# BB#0: - pushq %rbp -.Lcfi8: - .cfi_def_cfa_offset 16 -.Lcfi9: - .cfi_offset %rbp, -16 - movq %rsp, %rbp -.Lcfi10: - .cfi_def_cfa_register %rbp - pushq %rbx - pushq %rax -.Lcfi11: - .cfi_offset %rbx, -24 - movl $__fini_array_start, %eax - movl $__fini_array_end, %ecx - subq %rax, %rcx - movq %rcx, %rax - sarq $63, %rax - shrq $61, %rax - addq %rcx, %rax - sarq $3, %rax - je .LBB1_4 -# BB#1: - movl $__fini_array_start, %eax - movl $__fini_array_end, %ecx - subq %rax, %rcx - movq %rcx, %rbx - sarq $63, %rbx - shrq $61, %rbx - addq %rcx, %rbx - sarq $3, %rbx - .p2align 4, 0x90 -.LBB1_2: # =>This Inner Loop Header: Depth=1 - movq __fini_array_start-8(,%rbx,8), %rax - decq %rbx - cmpq $1, %rax - jbe .LBB1_3 -# BB#5: # in Loop: Header=BB1_2 Depth=1 - callq *%rax -.LBB1_3: # in Loop: Header=BB1_2 Depth=1 - testq %rbx, %rbx - jne .LBB1_2 -.LBB1_4: - addq $8, %rsp - popq %rbx - popq %rbp - jmp _fini # TAILCALL -.Lfunc_end1: - .size finalizer, .Lfunc_end1-finalizer - .cfi_endproc - - .type abitag,@object # @abitag - .section .note.tag,"a",@note - .p2align 2 -abitag: - .long 8 # 0x8 - .long 4 # 0x4 - .long 1 # 0x1 - .asciz "FreeBSD" - .long 1101001 # 0x10ccc9 - .size abitag, 24 - - .type .L.str,@object # @.str - .section .rodata.str1.1,"aMS",@progbits,1 -.L.str: - .zero 1 - .size .L.str, 1 - - .type __progname,@object # @__progname - .data - .globl __progname - .p2align 3 -__progname: - .quad .L.str - .size __progname, 8 - - .type crt_noinit_tag,@object # @crt_noinit_tag - .section .note.tag,"a",@note - .p2align 2 -crt_noinit_tag: - .long 8 # 0x8 - .long 4 # 0x4 - .long 2 # 0x2 - .asciz "FreeBSD" - .long 0 # 0x0 - .size crt_noinit_tag, 24 - - .type environ,@object # @environ - .comm environ,8,8 - .hidden __preinit_array_end - .hidden __preinit_array_start - .hidden __init_array_end - .hidden __init_array_start - .hidden __fini_array_end - .hidden __fini_array_start - .hidden _init - .hidden _fini - .weak _DYNAMIC - - .ident "FreeBSD clang version 4.0.0 (tags/RELEASE_400/final 297347) (based on LLVM 4.0.0)" - .section ".note.GNU-stack","",@progbits diff --git a/sys/include/sys/sysproto.h b/sys/include/sys/sysproto.h index 3564637..3c012f1 100644 --- a/sys/include/sys/sysproto.h +++ b/sys/include/sys/sysproto.h @@ -662,6 +662,21 @@ char tv_r_[PADR_(struct timeval *)]; }; +struct sys_gettimeofday_args { + char tp_l_[PADL_(struct timeval *)]; struct timeval * tp; char tp_r_[PADR_(struct timeval *)]; + char tzp_l_[PADL_(struct timezone *)]; struct timezone * tzp; char tzp_r_[PADR_(struct timezone *)]; +}; + + +struct sys_sendto_args { + char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; + char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)]; + char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; + char to_l_[PADL_(caddr_t)]; caddr_t to; char to_r_[PADR_(caddr_t)]; + char tolen_l_[PADL_(int)]; int tolen; char tolen_r_[PADR_(int)]; +}; + //Func Defs int sys_invalid(struct thread *, void *); int sys_exit(struct thread *, struct sys_exit_args *); @@ -736,4 +751,7 @@ int sys_socket(struct thread *td, struct sys_socket_args *); int sys_setsockopt(struct thread *td, struct sys_setsockopt_args *); int sys_select(struct thread *td, struct sys_select_args *); + +int sys_gettimeofday(struct thread *td, struct sys_gettimeofday_args *); +int sys_sendto(struct thread *td, struct sys_sendto_args *); #endif diff --git a/sys/kernel/gen_calls.c b/sys/kernel/gen_calls.c index 9513da1..cf82caa 100644 --- a/sys/kernel/gen_calls.c +++ b/sys/kernel/gen_calls.c @@ -326,3 +326,9 @@ return (0); } + +int sys_gettimeofday(struct thread *td, struct sys_gettimeofday_args *args) { + gettimeofday(args->tp, args->tzp); + td->td_retval[0] = 0; + return (0); +} diff --git a/sys/kernel/syscalls_posix.c b/sys/kernel/syscalls_posix.c index 934a7fb..a6ba9f2 100644 --- a/sys/kernel/syscalls_posix.c +++ b/sys/kernel/syscalls_posix.c @@ -147,7 +147,7 @@ { 0, "No Call", sys_invalid, SYSCALL_VALID }, /* 113 - Invalid */ { 0, "No Call", sys_invalid, SYSCALL_VALID }, /* 114 - Invalid */ { 0, "No Call", sys_invalid, SYSCALL_VALID }, /* 115 - Invalid */ - { 0, "No Call", sys_invalid, SYSCALL_VALID }, /* 116 - Invalid */ + { ARG_COUNT(sys_gettimeofday_args), "gettimeofday", sys_gettimeofday, SYSCALL_VALID }, // 116 - gettimeofday { 0, "No Call", sys_invalid, SYSCALL_VALID }, /* 117 - Invalid */ { 0, "No Call", sys_invalid, SYSCALL_VALID }, /* 118 - Invalid */ { 0, "No Call", sys_invalid, SYSCALL_VALID }, /* 119 - Invalid */ @@ -164,7 +164,7 @@ { 0, "No Call", sys_invalid, SYSCALL_VALID }, /* 130 - Invalid */ { 0, "No Call", sys_invalid, SYSCALL_VALID }, /* 131 - Invalid */ { 0, "No Call", sys_invalid, SYSCALL_VALID }, /* 132 - Invalid */ - { 0, "No Call", sys_invalid, SYSCALL_VALID }, /* 133 - Invalid */ + { ARG_COUNT(sys_sendto_args), "sendto", sys_sendto, SYSCALL_VALID }, // 133 - sendto { 0, "No Call", sys_invalid, SYSCALL_VALID }, /* 134 - Invalid */ { 0, "No Call", sys_invalid, SYSCALL_VALID }, /* 135 - Invalid */ { 0, "No Call", sys_invalid, SYSCALL_VALID }, /* 136 - Invalid */ diff --git a/sys/kernel/time.c b/sys/kernel/time.c index c5d470e..a3c5732 100644 --- a/sys/kernel/time.c +++ b/sys/kernel/time.c @@ -103,8 +103,8 @@ } int gettimeofday(struct timeval *tp, struct timezone *tzp) { - //tp->tv_sec = systemVitals->timeStart + systemVitals->sysUptime; - tp->tv_sec = 0x0; //systemVitals->sysUptime; + tp->tv_sec = systemVitals->timeStart + systemVitals->sysUptime; + //tp->tv_sec = 0x0; //systemVitals->sysUptime; tp->tv_usec = 0x0; return (0x0); } diff --git a/sys/net/net/sys_arch.c b/sys/net/net/sys_arch.c index 369adbf..4973f51 100644 --- a/sys/net/net/sys_arch.c +++ b/sys/net/net/sys_arch.c @@ -50,7 +50,7 @@ sys_sem_t *newSem = 0x0; if (*sem != 0) { - kpanic("UH OH!"); + kprintf("UH OH!"); } newSem = kmalloc(sizeof(struct sys_sem)); @@ -525,3 +525,13 @@ return(0); } + +int sys_sendto(struct thread *td, struct sys_sendto_args *args) { + struct file *fd = 0x0; + getfd(td, &fd, args->s); + + lwip_sendto(fd->socket, args->buf, args->len, args->flags, args->to, args->tolen); + td->td_retval[0] = 0x0; + + return (0); +}