The unified diff between revisions [144fb125..] and [7068a8cd..] is displayed below. It can also be downloaded as a raw diff.

#
#
# patch "config/boards/qemu_x86.mk"
#  from [89fc6c758de8fe7c4e283a6467673f95889fc1b4]
#    to [46c0abc63dcb2820ae0b8afe3706424e90724c1d]
#
# patch "src/boards/x86/kernel.adb"
#  from [18b135d3035f21646e18a0289ceaf8a02dd4c16d]
#    to [e317859b0fb1d7922ee6f6fc9af78e1d6b0b3801]
#
============================================================
--- config/boards/qemu_x86.mk	89fc6c758de8fe7c4e283a6467673f95889fc1b4
+++ config/boards/qemu_x86.mk	46c0abc63dcb2820ae0b8afe3706424e90724c1d
@@ -9,20 +9,24 @@ fd.img build_image.sh menu.txt mtoolsrc
 SRC_DIST=$(LOVELACE_TOPDIR)/src/boards/qemu_x86/support
 CLEAN+=$(SRC_DIST) sos_sources list_obj_bootstrap lovelace.elf \
 fd.img build_image.sh menu.txt mtoolsrc lovelace_alternative.elf \
-fd_alternative.img list_obj_bootstrap_alternative all_sources module.elf
+fd_alternative.img list_obj_bootstrap_alternative all_sources module.elf \
+test_kernel.elf
 SOS_DIR=sos-code-article6.5

 ADACTL=config/boards/project_x86.adp

 all:test_kernel.elf

-test_kernel.elf:$(OBJ_DIR)/kernel.o $(OBJ_DIR)/loader.o
+test_kernel.elf:$(OBJ_DIR)/kernel.o $(OBJ_DIR)/loader.o \
+$(OBJ_DIR)/bootstrap_alternative.o
 	ld -T $(LOVELACE_TOPDIR)/src/boards/x86/linker.ld -m elf_i386 \
-	-o test_kernel.elf $(OBJ_DIR)/kernel.o $(OBJ_DIR)/loader.o
+	-o test_kernel.elf $(OBJ_DIR)/kernel.o $(OBJ_DIR)/loader.o \
+	$(OBJ_DIR)/lovelace-stage1-console.o $(OBJ_DIR)/lovelace-outb.o

 $(OBJ_DIR)/kernel.o:$(LOVELACE_TOPDIR)/src/boards/x86/kernel.adb \
 $(LOVELACE_TOPDIR)/src/boards/x86/kernel.ads $(OBJ_DIR) all_sources
 	gcc -m32 -c -nostdlib -nostdinc -I$(LOVELACE_TOPDIR)/runtime_kernel \
+	-I$(LOVELACE_TOPDIR)/src/core \
 	-o $@ $<

 $(OBJ_DIR)/loader.o:$(LOVELACE_TOPDIR)/src/boards/x86/loader.s $(OBJ_DIR)
============================================================
--- src/boards/x86/kernel.adb	18b135d3035f21646e18a0289ceaf8a02dd4c16d
+++ src/boards/x86/kernel.adb	e317859b0fb1d7922ee6f6fc9af78e1d6b0b3801
@@ -1,4 +1,5 @@ with System.Storage_Elements;
 with System.Storage_Elements;
+with Lovelace.Stage1.Console;

 procedure Kernel (Mdb : System.Address;
                   Magic : Interfaces.Unsigned_32) is
@@ -20,6 +21,7 @@ begin
       Videoram (1) := 65;
       Videoram (2) := 7;
    end;
+   Lovelace.Stage1.Console.Put_Line ("test extension");
    loop
       null;
    end loop;