Merge pull request #1206 from fwsGonzo/dev

kernel: Use panic instead of assert for sanity checks

Author: fwsGonzo

src/drivers/vmxnet3.cpp

@@ -118,7 +118,6 @@ vmxnet3::vmxnet3(hw::PCI_Device& d) :
     INFO2("[x] Device has %u MSI-X vectors", msix_vectors);
     assert(msix_vectors >= 3);
     if (msix_vectors > 3) msix_vectors = 3;
-    std::vector<uint8_t> irqs;
 
     for (int i = 0; i < msix_vectors; i++)
     {
@@ -144,10 +143,12 @@ vmxnet3::vmxnet3(hw::PCI_Device& d) :
   assert(this->ptbase);
 
   // verify and select version
-  assert(check_version());
+  bool ok = check_version();
+  assert(ok);
 
   // reset device
-  assert(reset());
+  ok = reset();
+  assert(ok);
 
   // get mac address
   retrieve_hwaddr();

src/hw/pci_device.cpp

@@ -183,7 +183,8 @@ namespace hw {
 
     // enable MSI-x if its supported
     if (this->msix_cap()) {
-      assert(this->init_msix());
+      int vectors = this->init_msix();
+      assert(vectors > 0);
     }
   }
 

src/kernel/sanity_checks.cpp

@@ -21,6 +21,7 @@
 #include <kprint>
 #include <util/crc32.hpp>
 #include <kernel/elf.hpp>
+#include <kernel/syscalls.hpp>
 
 // NOTE: crc_to MUST NOT be initialized to zero
 static uint32_t crc_ro = CRC32_BEGIN();
@@ -54,14 +55,16 @@ void kernel_sanity_checks()
   uint32_t new_ro = generate_ro_crc();
   if (crc_ro != new_ro) {
     kprintf("CRC mismatch %#x vs %#x\n", crc_ro, new_ro);
-    assert(0 && "CRC of kernel read-only area failed");
+    panic("Sanity checks: CRC of kernel read-only area failed");
   }
   // verify that first page is zeroes only
   for (volatile int* lowmem = NULL; lowmem < LOW_CHECK_SIZE; lowmem++)
   if (UNLIKELY(*lowmem != 0)) {
     kprintf("Memory at %p was not zeroed: %#x\n", lowmem, *lowmem);
-    assert(0 && "Low-memory zero test");
+    panic("Sanity checks: Low-memory zero test");
   }
   // verify that Elf symbols were not overwritten
-  assert(Elf::verify_symbols() && "Check consistency of Elf symbols and string areas");
+  bool symbols_verified = Elf::verify_symbols();
+  if (!symbols_verified)
+    panic("Sanity checks: Consistency of Elf symbols and string areas");
 }