diff options
| -rw-r--r-- | .gdbinit | 3 | ||||
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | kernel/Makefile | 2 | ||||
| -rw-r--r-- | kernel/features/net.c | 13 | ||||
| -rwxr-xr-x | run | 19 |
5 files changed, 28 insertions, 22 deletions
diff --git a/.gdbinit b/.gdbinit new file mode 100644 index 0000000..85609a8 --- /dev/null +++ b/.gdbinit @@ -0,0 +1,3 @@ +file build/kernel.elf +target remote localhost:1234 +c @@ -1,18 +1,21 @@ # MIT License, Copyright (c) 2020 Marvin Borner # Kernel optimization -OPTIMIZATION = -Ofast +OPTIMIZATION = -O0 # Remove tree optimizations for kernel -CFLAGS_EXTRA = -fno-tree-bit-ccp -fno-tree-builtin-call-dce -fno-tree-ccp -fno-tree-ch -fno-tree-coalesce-vars -fno-tree-copy-prop -fno-tree-dce -fno-tree-dominator-opts -fno-tree-dse -fno-tree-fre -fno-tree-pta -fno-tree-sink -fno-tree-slsr -fno-tree-sra -fno-tree-ter -fno-tree-loop-vectorize -fno-inline-functions -fno-inline-functions-called-once +#CFLAGS_EXTRA = -fno-tree-bit-ccp -fno-tree-builtin-call-dce -fno-tree-ccp -fno-tree-ch -fno-tree-coalesce-vars -fno-tree-copy-prop -fno-tree-dce -fno-tree-dominator-opts -fno-tree-dse -fno-tree-fre -fno-tree-pta -fno-tree-sink -fno-tree-slsr -fno-tree-sra -fno-tree-ter -fno-tree-loop-vectorize -fno-inline-functions -fno-inline-functions-called-once # Remove ipa optimizations for kernel -CFLAGS_EXTRA += -fno-inline-functions -fno-inline-functions-called-once -fno-reorder-functions -fno-reorder-blocks -fno-reorder-blocks-and-partition -fno-ipa-profile -fno-ipa-pure-const -fno-ipa-reference -fno-ipa-reference-addressable -fno-merge-constants -fno-ipa-bit-cp -fno-ipa-cp -fno-ipa-icf -fno-ipa-ra -fno-ipa-sra -fno-ipa-vrp -fno-ipa-cp-clone +#CFLAGS_EXTRA += -fno-inline-functions -fno-inline-functions-called-once -fno-reorder-functions -fno-reorder-blocks -fno-reorder-blocks-and-partition -fno-ipa-profile -fno-ipa-pure-const -fno-ipa-reference -fno-ipa-reference-addressable -fno-merge-constants -fno-ipa-bit-cp -fno-ipa-cp -fno-ipa-icf -fno-ipa-ra -fno-ipa-sra -fno-ipa-vrp -fno-ipa-cp-clone #CFLAGS_EXTRA = -pie -fPIE -mno-80387 -mno-mmx -mno-sse -mno-sse2 -fno-asynchronous-unwind-tables -export - all: compile +debug: DEBUG = -ggdb3 -s +debug: compile + +export + compile: @$(MAKE) clean --no-print-directory -C libc/ @$(MAKE) libc --no-print-directory -C libc/ diff --git a/kernel/Makefile b/kernel/Makefile index cca186c..36aa9ee 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -24,7 +24,7 @@ OC = ccache ../cross/opt/bin/i686-elf-objcopy AS = ccache nasm WARNINGS = -Wall -Wextra -pedantic-errors -Wshadow -Wpointer-arith -Wwrite-strings -Wredundant-decls -Wnested-externs -Wno-long-long -CFLAGS = $(WARNINGS) -Wno-address-of-packed-member -nostdlib -nostdinc -ffreestanding -fno-builtin -mno-red-zone -mgeneral-regs-only -std=c99 -m32 -Wl,-ekernel_main -I../libc/inc/ -Iinc/ -Dkernel $(CFLAGS_EXTRA) $(OPTIMIZATION) +CFLAGS = $(WARNINGS) -Wno-address-of-packed-member -nostdlib -nostdinc -ffreestanding -fno-builtin -mno-red-zone -mgeneral-regs-only -std=c99 -m32 -Wl,-ekernel_main -I../libc/inc/ -Iinc/ -Dkernel $(CFLAGS_EXTRA) $(OPTIMIZATION) $(DEBUG) ASFLAGS = -f elf32 all: compile diff --git a/kernel/features/net.c b/kernel/features/net.c index 19b76bc..3c1d620 100644 --- a/kernel/features/net.c +++ b/kernel/features/net.c @@ -424,7 +424,6 @@ void tcp_handle_packet(struct tcp_packet *packet, u32 dst, int len) /* tcp->ack_no += strlen(http_req); */ - print("Setting to 5!\n"); tcp->state = 5; // TODO: TCP enum state machine return; } else if (tcp->state == 5 && (flags & 0xff) == TCP_FLAG_ACK) { @@ -653,11 +652,13 @@ void net_send(struct socket *socket, void *data, u32 len) void net_install(void) { - if (rtl8139_install()) { - sti(); - arp_lookup_add(broadcast_mac, 0xffffffff); - dhcp_discover(); - } + if (!rtl8139_install()) + return; + + sti(); + + arp_lookup_add(broadcast_mac, 0xffffffff); + dhcp_discover(); tcp_sockets = list_new(); udp_sockets = list_new(); @@ -24,12 +24,8 @@ no_ask="${2}" # TODO: Support q35 chipset ('-machine q35') - loops in ide_wait qemu_with_flags() { - if [ -z "$network" ]; then network="rtl8139"; fi - if [ "$network" != "false" ] && [ "$mode" = "net" ]; then - qemu-system-i386 -cpu max -no-reboot -vga std -rtc base=localtime -m 256M -smp 4 -netdev user,id=net0,hostfwd=tcp:127.0.0.1:8000-10.0.2.15:8000 -device $network,netdev=net0 -object filter-dump,id=dump,netdev=net0,file=dump.pcap "$@" - else - qemu-system-i386 -cpu max -no-reboot -vga std -rtc base=localtime -m 256M -smp 4 "$@" - fi + network="rtl8139" + qemu-system-i386 -cpu max -no-reboot -vga std -rtc base=localtime -m 256M -smp 4 -netdev user,id=net0,hostfwd=tcp:127.0.0.1:8000-10.0.2.15:8000 -device $network,netdev=net0 -object filter-dump,id=dump,netdev=net0,file=dump.pcap "$@" } make_cross() { @@ -113,7 +109,11 @@ make_build() { rm -rf build/* printf "\nBuilding...\n" - $MAKE -j $($NPROC) + if [ "$mode" = "debug" ]; then + $MAKE -j $($NPROC) debug + else + $MAKE -j $($NPROC) + fi # Create disk image dd if=/dev/zero of=build/disk.img bs=1k count=32k status=none @@ -179,7 +179,7 @@ make_test() { } make_debug() { - qemu_with_flags -drive file=build/disk.img,format=raw,index=1,media=disk -s -S + qemu_with_flags -serial stdio -drive file=build/disk.img,format=raw,index=1,media=disk -s -S } make_disasm() { @@ -248,7 +248,7 @@ elif [ "${mode}" = "debug" ]; then make_build make_sync & make_debug -elif [ "${mode}" = "test" ] || [ "${mode}" = "net" ] || [ "${mode}" = "" ]; then +elif [ "${mode}" = "test" ] || [ "${mode}" = "" ]; then make_cross make_clean make_build @@ -267,7 +267,6 @@ else printf "disasm\t\tDisassembles the main kernel binary\n" printf "sync\t\tSyncs the 'tags' and 'compile_commands.json' file\n" printf "disk\t\tPrepares the userspace disk (e.g. fonts)\n" - printf "net\t\tBuilds and runs Melvix in network mode using QEMU (cross+clean+build)\n" printf "nothing\t\tWhen no option is set, Melvix gets built and emulated using QEMU (cross+clean+build)\n" printf "*\t\tAnything else prints this help\n\n" fi |