Fixed build and updated some packages

Cargo.toml

@@ -31,14 +31,14 @@ lto = true
 panic = "abort"
 
 [dependencies]
-x86_64 = "0.8.3"
-bootloader = { version = "0.8.3", features = ["map_physical_memory"] }
+x86_64 = {version = "0.14.3", features = ["nightly"]}
+bootloader = { version = "0.9.0", features = ["map_physical_memory"] }
 log = "0.4.8"
 volatile = "0.2.6"
 lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
-intrusive-collections = { version = "0.8.3", features = ["nightly"] }
+intrusive-collections = { version = "0.9.1", features = ["nightly"] }
 arrayvec = { version = "0.5.1", default-features = false }
-acpi = "0.4.0"
+acpi = "3.0.0"
 aml = "0.4.0"
 #acpi = { path = "../acpi/acpi/" }
 #aml = { path = "../acpi/aml/" }

bx_enh_dbg.ini

@@ -0,0 +1,26 @@
+# bx_enh_dbg_ini
+SeeReg[0] = TRUE
+SeeReg[1] = TRUE
+SeeReg[2] = TRUE
+SeeReg[3] = TRUE
+SeeReg[4] = FALSE
+SeeReg[5] = FALSE
+SeeReg[6] = FALSE
+SeeReg[7] = FALSE
+SingleCPU = FALSE
+ShowIOWindows = TRUE
+ShowButtons = TRUE
+SeeRegColors = TRUE
+ignoreNxtT = TRUE
+ignSSDisasm = TRUE
+UprCase = 0
+DumpInAsciiMode = 3
+isLittleEndian = TRUE
+DefaultAsmLines = 512
+DumpWSIndex = 0
+DockOrder = 0x123
+ListWidthPix[0] = 484
+ListWidthPix[1] = 671
+ListWidthPix[2] = 765
+MainWindow = 0, 0, 1295, 370
+FontName = Normal

scripts/bochs.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
-bootimage build
+cargo xbuild
 dd if=/dev/zero of=/tmp/solstice.img count=1008 bs=512
 dd if=target/x86_64-solstice/debug/bootimage-solstice.bin of=/tmp/solstice.img conv=notrunc
 bochs -f scripts/.bochsrc -q

scripts/debug.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+set -me
+cargo xbuild
+qemu-system-x86_64 -drive format=raw,file=../target/x86_64-solstice/debug/bootimage-solstice.bin -machine q35 -no-reboot -S -s -d int,guest_errors -no-shutdown

scripts/gdb.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 set -me
-bootimage build
-qemu-system-x86_64 -drive format=raw,file=target/x86_64-solstice/debug/bootimage-solstice.bin -no-reboot -S -s &
+cargo xbuild
+qemu-system-x86_64 -drive format=raw,file=../target/x86_64-solstice/debug/bootimage-solstice.bin -machine q35 -no-reboot -S -s &
 sleep 0.5
-gdb target/x86_64-solstice/debug/solstice -ex "target remote :1234"
-pkill qemu
+gdb ../target/x86_64-solstice/debug/solstice -ex "target remote :1234"

scripts/symextract.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+nm $1 | grep " T " | awk '{ print $1" "$3 }' > $1.sym

src/cpu/gdt.rs

@@ -17,7 +17,6 @@ lazy_static! {
         tss.interrupt_stack_table[DOUBLE_FAULT_IST_INDEX as usize] = {
             const STACK_SIZE: usize = 4096;
             static mut STACK: [u8; STACK_SIZE] = [0; STACK_SIZE];
-
             let stack_start = VirtAddr::from_ptr(unsafe { &STACK });
 
             stack_start + STACK_SIZE
@@ -54,15 +53,15 @@ pub fn load() {
         let null_segment = SegmentSelector::new(0, PrivilegeLevel::Ring0);
         let code_segment = SegmentSelector::new(1, PrivilegeLevel::Ring0);
         let tss_segment = SegmentSelector::new(2, PrivilegeLevel::Ring0);
-
         seg::load_ds(null_segment);
-        seg::load_es(null_segment);
-        seg::load_fs(null_segment);
-        seg::load_gs(null_segment);
-        seg::load_ss(null_segment);
+        seg::load_es(SegmentSelector::new(0, PrivilegeLevel::Ring0));
+        seg::load_fs(SegmentSelector::new(0, PrivilegeLevel::Ring0));
+        seg::load_gs(SegmentSelector::new(0, PrivilegeLevel::Ring0));
+        seg::load_ss(SegmentSelector::new(0, PrivilegeLevel::Ring0));
         seg::set_cs(code_segment);
         load_tss(tss_segment);
+
     }
 
-    debug!("gdt: loaded");
+    //debug!("gdt: loaded");
 }