Merge pull request #1369 from fwsGonzo/dev

Botan TLS on 64-bit

Author: fwsGonzo

cmake/botan.cmake

@@ -4,14 +4,14 @@
 include(ExternalProject)
 
 if(${ARCH} STREQUAL "x86_64")
-  set(BOTAN_HASH 7432fa529d86070317f594dddb07944f)
+  set(BOTAN_HASH fb698d0f5c9497b7029c9573888c22c8)
 elseif(${ARCH} STREQUAL "i686")
-  set(BOTAN_HASH 5ef7f26047f8fe17219f62755938621d)
+  set(BOTAN_HASH c22686843461d58a5ac15da7fab18e21)
 endif()
 
 ExternalProject_Add(botan
         PREFIX botan
-        URL https://github.com/includeos/botan/releases/download/inc-2.0/botan-includeos-${ARCH}.tar.gz
+        URL https://github.com/fwsgonzo/botan/releases/download/v0.11/botan-includeos-${ARCH}.tar.gz
         URL_HASH MD5=${BOTAN_HASH}
         CONFIGURE_COMMAND ""
         BUILD_COMMAND ""

cmake/post.service.cmake

@@ -248,6 +248,10 @@ add_library(libgcc STATIC IMPORTED)
 set_target_properties(libgcc PROPERTIES LINKER_LANGUAGE C)
 set_target_properties(libgcc PROPERTIES IMPORTED_LOCATION ${INSTALL_LOC}/${ARCH}/lib/libgcc.a)
 
+# Depending on the output of this command will make it always run. Like magic.
+add_custom_command(OUTPUT fake_news
+      COMMAND cmake -E touch_nocreate alternative_facts)
+
 # add memdisk
 function(add_memdisk DISK)
   get_filename_component(DISK_RELPATH "${DISK}"
@@ -256,7 +260,7 @@ function(add_memdisk DISK)
     OUTPUT  memdisk.o
     COMMAND python ${INSTALL_LOC}/memdisk/memdisk.py --file ${INSTALL_LOC}/memdisk/memdisk.asm ${DISK_RELPATH}
     COMMAND nasm -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} ${INSTALL_LOC}/memdisk/memdisk.asm -o memdisk.o
-    DEPENDS ${DISK_RELPATH}
+    DEPENDS ${DISK_RELPATH} fake_news
   )
   add_library(memdisk STATIC memdisk.o)
   set_target_properties(memdisk PROPERTIES LINKER_LANGUAGE CXX)
@@ -269,8 +273,9 @@ function(diskbuilder FOLD)
   add_custom_command(
       OUTPUT  memdisk.fat
       COMMAND ${INSTALL_LOC}/bin/diskbuilder -o memdisk.fat ${REL_PATH}
-    )
-  add_custom_target(diskbuilder ALL DEPENDS memdisk.fat)
+      DEPENDS fake_news
+      )
+    add_custom_target(diskbuilder ALL DEPENDS memdisk.fat)
   add_dependencies(service diskbuilder)
   add_memdisk("${CMAKE_BINARY_DIR}/memdisk.fat")
 endfunction()

src/kernel/multiboot.cpp

@@ -20,7 +20,7 @@
 #include <kprint>
 #include <boot/multiboot.h>
 
-#define DEBUG 1
+//#define DEBUG
 #if defined(DEBUG)
 #define debug(X,...)  kprintf(X,##__VA_ARGS__);
 #else

src/kernel/os.cpp

@@ -251,12 +251,12 @@ void OS::halt() {
 #warning "OS::halt() not implemented for selected arch"
 #endif
   // Count sleep cycles
-  *os_cycles_hlt += cycles_since_boot() - *os_cycles_total;
+  if (os_cycles_hlt)
+      *os_cycles_hlt += cycles_since_boot() - *os_cycles_total;
 }
 
 void OS::event_loop()
 {
-
   IRQ_manager::get().process_interrupts();
   do {
     OS::halt();