[Test] Compare memory loaded at BT Stage 2

Author: scopeInfinity

src/bootloader/stage2.c

@@ -9,18 +9,33 @@
 #define GDT_TABLE_SIZE 5
 struct GDTEntry gdt_table[GDT_TABLE_SIZE];
 
+char DIGIT_TO_HEX[] = "0123456789ABCDEF";
+
 extern struct GDTReference* _low_get_gdtr_address();
 extern void enter_protected_mode();
 extern void label_exit();
 
+
+char *get_memdump_8byte(void *address) {
+    static char shared_memdump[17];
+    for(int i=0;i<8;i++) {
+        unsigned char byte = *(char*)address;
+        address++;
+        shared_memdump[i<<1]     = DIGIT_TO_HEX[byte/16];
+        shared_memdump[(i<<1)|1] = DIGIT_TO_HEX[byte%16];
+    }
+    shared_memdump[16] = '\0';
+    return shared_memdump;
+}
+
 void load_kernel() {
     print_log("Loading Kernel");
     int err = load_sectors(MEMORY_LOCATION_KERNEL, 0x80, SECTOR_START_KERNEL, SECTOR_COUNT_KERNEL);
     if(err) {
         print_log("Failed to load kernel in memory: %d", err);
         label_exit();
     } else {
-        print_log("Kernel loaded at 0x%x: %x...", MEMORY_LOCATION_KERNEL, *(int*)MEMORY_LOCATION_KERNEL);
+        print_log("Kernel loaded at 0x%x: %s...", MEMORY_LOCATION_KERNEL, get_memdump_8byte(MEMORY_LOCATION_KERNEL));
     }
 }
 
@@ -31,7 +46,7 @@ void load_static_library() {
         print_log("Failed to load static library in memory: %d", err);
         label_exit();
     } else {
-        print_log("Static library loaded at 0x%x: %x...", MEMORY_STATIC_LIBRARY, *(int*)MEMORY_STATIC_LIBRARY);
+        print_log("Static library loaded at 0x%x: %s...", MEMORY_STATIC_LIBRARY, get_memdump_8byte(MEMORY_STATIC_LIBRARY));
     }
 }
 

tests/bootloader_stage1_test.sh

@@ -11,11 +11,8 @@ os_test_up "${TEST_MAGIC_WANT:?}" "${TEST_INJECT_WORD:?}" || exit -1
 set -e
 set -x
 
-echo "${SCREEN_CONTENT:?}" | grep "Bootloader: Stage 1" || \
-	err $LINENO "Test Failed! "
-
-echo "${SCREEN_CONTENT:?}" | grep "Stage 2 Loaded: `build_8hexbyte bootloader/stage2`" || \
-	err $LINENO "Test Failed! "
+test_screen_content $LINENO "Bootloader: Stage 1"
+test_screen_content $LINENO "Stage 2 Loaded: `build_8hexbyte bootloader/stage2`"
 
 wait ${QEMU_PID:?}
 echo "$0 passed!!!"

tests/bootloader_stage2_test.sh

@@ -9,10 +9,11 @@ os_test_up "${TEST_MAGIC_WANT:?}" "${TEST_INJECT_WORD:?}" || exit -1
 
 # Test
 set -e
-echo "${SCREEN_CONTENT:?}" | grep "Bootloader: Stage 2" || \
-    ( echo "Test Failed!" && exit -1 )
-echo "${SCREEN_CONTENT:?}" | grep "Loading GDT Table and entering protected mode" || \
-    ( echo "Test Failed!" && exit -1 )
+
+test_screen_content $LINENO "Bootloader: Stage 2"
+test_screen_content $LINENO "Static library loaded at.*: `build_8hexbyte real_mode/static_library`"
+test_screen_content $LINENO "Kernel loaded at.*: `build_8hexbyte kernel/core`"
+test_screen_content $LINENO "Loading GDT Table and entering protected mode"
 
 wait ${QEMU_PID:?}
 echo "$0 passed!!!"

tests/lib.sh

@@ -25,6 +25,8 @@ function err() {
 # Resolves filename from build target.
 # Arguments:
 #   build target
+# Globals:
+#   BUILD_TEST_DIR
 # Output:
 #   filename
 ##########################################
@@ -43,6 +45,21 @@ function build_8hexbyte() {
     xxd -p -g1 -l 8 -u "`build_filename $1`"
 }
 
+##########################################
+# Test Helper: Check if content is present
+# on screen.
+# Arguments:
+#   line number
+#   content
+# Globals:
+#   test_screen_content
+# Output:
+#   raises error or nothing.
+##########################################
+function test_screen_content() {
+    echo "${SCREEN_CONTENT:?}" | grep "${2:?}" || \
+    err "${1:?}" "Test Failed! Couldn't find '${2:?}' on screen."
+}
 
 ##########################################
 # Activate Code for testing within source.
@@ -121,7 +138,7 @@ function os_test_up() {
         sleep 1s
     done
 
-    sleep 5s
+    sleep 1s
     ./tests/qemu_monitor_expect.sh ${MONITOR_PORT:?} "screendump ${QEMU_SCREENSHOT:?}"
     ./tests/qemu_monitor_expect.sh ${MONITOR_PORT:?} "quit"