From a8ca22f150a20e1600a426ab262d3fb0368e4a5f Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Sat, 9 Mar 2019 23:01:02 +0100 Subject: [PATCH 1/2] stuff --- boot/loader/cpu/cpu.inc | 9 ++++++++- boot/loader/loader.asm | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/boot/loader/cpu/cpu.inc b/boot/loader/cpu/cpu.inc index 8b92819..d97e2d6 100644 --- a/boot/loader/cpu/cpu.inc +++ b/boot/loader/cpu/cpu.inc @@ -60,4 +60,11 @@ tritemporize: ; ---------------------------------------------------------------------------- ; ; Returns the CPU Vendor String.pointer in eax ; ; ---------------------------------------------------------------------------- ; -cpu_vendor +cpu_vendor: + + ;; Calling the competent authorities + mov eax, 0 + cpuid + + ret +.string db " " diff --git a/boot/loader/loader.asm b/boot/loader/loader.asm index 0ddf7b6..ed1b828 100644 --- a/boot/loader/loader.asm +++ b/boot/loader/loader.asm @@ -152,7 +152,7 @@ _loader64: call tritemporize ; Let time to see extern StartKern - jmp StartKern + ;jmp StartKern ;; We must never reach this point ------------------------------------------- ;; jmp Die From b91b7adbe3f1d79d92ee132bfee765074de00cdf Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Mon, 11 Mar 2019 13:28:01 +0100 Subject: [PATCH 2/2] Update Readme.md (#32) --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 950387d..566c708 100644 --- a/Readme.md +++ b/Readme.md @@ -23,7 +23,7 @@ apt update && apt upgrade apt install grub-pc dosfstools make nasm ``` -You also need to have the [OS/K cross-compiler](https://www.os-k.eu/build-tools/cross-cc.tar.xz) in `/opt/cross-cc`. +You also need to have the [x86-64 ELF gcc cross-compiler](https://www.os-k.eu/build-tools/cross-cc.tar.xz) in `/opt/cross-cc`. To compile for the first time, you must compile the whole project, in order to build the loop disk image :