Update boot.asm

[franzageek]

• Refactor the code (split it into .text and .data section);
• Improve label naming;
• Remove jumps before 'ret's.

[adamperkowski]

Hey. Thanks for contributing again!
The code looks good but there's one small issue. It doesn't boot. I'll look into it later today.

[franzageek]

Oop so sorry, lemme try to fix it. It could be that no entry point was specified, I'll give it a try.

[adamperkowski]

I'll add a boot check to this assembly CI, because now it only compiles and that could be misleading.

[adamperkowski]

Still doesn't boot for me in QEMU.

[franzageek]

Adding an extra boot check sounds like a good idea. I'm on a Mac rn so I couldn't test the code before committing, thinking that because the changes were not invasive, it should've booted just fine. I've just updated it - lmk if it works fine :)
EDIT: didn't see the previous comment - my bad.
Working on a fix rn.
EDIT2: omw to install QEMU rn.

[franzageek]

I think I've found the bug, trying to fix it.

[adamperkowski]

Added a job that checks if a DOS boot sector is present. It's not a full "boot check" but it'll do.

highlightos/.github/workflows/asm.yml

Lines 26 to 30 in 4346236

	- name: Check DOS/MBR boot sector
	id: bootsector
	run: echo "::set-output name=check::$(file ./asm/boot.bin)"
	- name: Validate the check
	run: 'echo "${{ steps.bootsector.outputs.check }}" | grep -q "./asm/boot.bin: DOS/MBR boot sector"'

[adamperkowski]

I'll update your branch.

[franzageek]

There you go, fixed. I forgot that 16 bit Real Mode assembly does not support splitting code in text/data sections. I'm used to program in 32/64 bit Protected mode. Very sorry, should be fixed now.

While debugging, I found another bug - after pressing enter the program flow remained trapped in an infinite loop, because I replaced a jump with a ret.

Fixed that as well.

Try it out for yourself and let me know if it sticks!

[adamperkowski]

Seems like you forgot about this bc369ce .
Added.

input wasn't looping because of that

[franzageek]

Actually no - the reason was the jmp shell line on line 116/117.
EDIT: yeah, forgot abt both. I'm sorry man, bit tired these days.

[adamperkowski]

No problem at all. Happens. So yeah thanks for taking your time and contributing again. Much appreciated. I'll merge this if you don't want to add anything.

[franzageek]

Sure! Really like the vision & the direction of this project.
Let me review the code - will add anything if necessary.

[adamperkowski]

Message me privately please through Discord, Signal, e-mail or whatever you like. Merging.

[franzageek]

Alright - just sent you a DM request on Discord.