resolve merge conflicts

bochsrc.txt

@@ -1,57 +0,0 @@
-# configuration file generated by Bochs
-plugin_ctrl: unmapped=true, biosdev=true, speaker=true, extfpuirq=true, parallel=true, serial=true, iodebug=true, pcidev=false, usb_uhci=false
-config_interface: textconfig
-display_library: x
-memory: host=32, guest=32
-romimage: file="/usr/share/bochs/BIOS-bochs-latest", address=0x00000000, options=none
-vgaromimage: file="/usr/share/bochs/VGABIOS-lgpl-latest"
-boot: floppy
-floppy_bootsig_check: disabled=0
-floppya: type=1_44
-# no floppyb
-ata0: enabled=true, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14
-ata0-master: type=disk, path="bin/shade.iso", mode=flat, cylinders=0, heads=0, spt=0, sect_size=512, model="Generic 1234", biosdetect=auto, translation=auto
-ata0-slave: type=none
-ata1: enabled=true, ioaddr1=0x170, ioaddr2=0x370, irq=15
-ata1-master: type=none
-ata1-slave: type=none
-ata2: enabled=false
-ata3: enabled=false
-optromimage1: file=none
-optromimage2: file=none
-optromimage3: file=none
-optromimage4: file=none
-optramimage1: file=none
-optramimage2: file=none
-optramimage3: file=none
-optramimage4: file=none
-pci: enabled=1, chipset=i440fx, slot1=none, slot2=none, slot3=none, slot4=none, slot5=none
-vga: extension=vbe, update_freq=5, realtime=1, ddc=builtin
-cpu: count=1:1:1, ips=4000000, quantum=16, model=bx_generic, reset_on_triple_fault=1, cpuid_limit_winnt=0, ignore_bad_msrs=1, mwait_is_nop=0
-cpuid: level=6, stepping=3, model=3, family=6, vendor_string="AuthenticAMD", brand_string="AMD Athlon(tm) processor"
-cpuid: mmx=true, apic=xapic, simd=sse2, sse4a=false, misaligned_sse=false, sep=true
-cpuid: movbe=false, adx=false, aes=false, sha=false, xsave=false, xsaveopt=false, avx_f16c=false
-cpuid: avx_fma=false, bmi=0, xop=false, fma4=false, tbm=false, x86_64=true, 1g_pages=false
-cpuid: pcid=false, fsgsbase=false, smep=false, smap=false, mwait=true
-print_timestamps: enabled=0
-debugger_log: -
-magic_break: enabled=0
-port_e9_hack: enabled=0
-private_colormap: enabled=0
-clock: sync=none, time0=local, rtc_sync=0
-# no cmosimage
-log: -
-logprefix: %t%e%d
-debug: action=ignore
-info: action=report
-error: action=report
-panic: action=ask
-keyboard: type=mf, serial_delay=250, paste_delay=100000, user_shortcut=none
-mouse: type=ps2, enabled=false, toggle=ctrl+mbutton
-speaker: enabled=true, mode=system
-parport1: enabled=true, file=none
-parport2: enabled=false
-com1: enabled=true, mode=null
-com2: enabled=false
-com3: enabled=false
-com4: enabled=false

src/boot/entry.asm

@@ -48,17 +48,10 @@ check_cpuid:
     jmp error
     
 check_x64_supported:
-<<<<<<< HEAD
     mov eax, 0x80000000
 	cpuid
 	cmp eax, 0x80000001
 	jb .x64_unsupported ; CPUID extended feature set isnt even supported, def no x64
-=======
-    mov eax, 0x80000000 ; Magic code that i dont understand
-	cpuid ; Magic code that i dont understand
-	cmp eax, 0x80000001 ; Magic code that i dont undetstand
-	jb .x64_unsupported ; Something went wrong so x64 isnt supported
->>>>>>> a6f98cddb6e41c517b2f8129624d0ad8965ee0f9
 
 	mov eax, 0x80000001 ; Set magic value 0x80000001 into EAX for cpuid
 	cpuid ; Get "extended features list" from CPU info
@@ -138,7 +131,6 @@ stack_bottom:
 stack_top:
 
 section .rodata
-<<<<<<< HEAD
 ; Access bits
 PRESENT        equ 1 << 7
 NOT_SYS        equ 1 << 4
@@ -184,13 +176,6 @@ gdt64:
         db PRESENT | RING3 | NOT_SYS | RW        ; access: 0b11110010
         db GRAN_4K | SZ_32 | 0xf                 ; flags and limit (high, bits 16-19)
         db 0                                     ; base (high, bits 24-31)
-=======
-gdt64:
-	dd 0 ; zero entry
-	dd 0
-.code_segment: equ $ - gdt64
-	dq (1 << 43) | (1 << 44) | (1 << 47) | (1 << 53) ; code segment
->>>>>>> a6f98cddb6e41c517b2f8129624d0ad8965ee0f9
 .pointer:
 	dw $ - gdt64 - 1 ; length
 	dq gdt64 ; address