update

Author: paule32

.gitignore

@@ -110,3 +110,7 @@ src/_internal/shared/start.exe
 src/_internal/shared/start.bin
 src/_internal/shared/ne.exe
 src/_internal/shared/dos.exe
+src/_internal/shared/start.bin
+src/_internal/shared/start.exe
+src/_internal/shared/KERNEL.BIN
+src/_internal/shared/dos.exe

src/_internal/shared/KERNEL.BIN

@@ -13,7 +13,7 @@ putc:
     push dx
     mov dl, al
     mov ah, 02h
-    int 21h
+    SysCall
     pop dx
     ret
 
@@ -27,7 +27,7 @@ DOSrncrlf:
 
 DOSPutStrColor:
     mov  ah, 09h
-    int  0x21
+    SysCall
     ret
 
 print_z:
@@ -59,9 +59,7 @@ DOS_ConsoleWrite:
     lodsb
     cmp al, '$'
     je .pe_done
-    mov dl, al
-    mov ah, 0x02
-    int 21h
+    call putc
     inc si
     jmp .print_z_loop
     .pe_done:
@@ -84,32 +82,33 @@ PutStrColor:
     ; -------------------
     .print_loop:
     lodsb                ; AL := [SI], SI++
-    cmp  al, 0x00        ; reach end  ?
-    je   .printed
-    cmp  al, 0x0d
-    je   .printed
-    cmp  al, 0x0a
-    je   .printed
-    cmp  al, 0x00
-    je   .printed
+    
+    COMPARE al, 0x00, .printed  ; reach end  ?
+    COMPARE al, 0x0d, .printed
+    COMPARE al, 0x0a, .printed
+    
     test al, al
     jz   .printed
     mov  ah, 09h         ; Teletype-Ausgabe
     mov  cx, 1           ; mim
-    int  10h
+    VideoCall
     
     mov ah, 02h
     xor bh, bh
     inc dl
-    int 10h
+    VideoCall
     
     jmp  .print_loop
 
     .printed:
-    ; --- Cursorposition lesen (AH=03h) ---
+    call  DOS_getCursor
+    ret
+    
+; --- Cursorposition lesen (AH=03h) ---
+DOS_getCursor:
     mov  ah, 03h         ; Read Cursor Position
     mov  bh, 0           ; Videoseite 0
-    int  10h             ; Rückgabe: DH=Zeile, DL=Spalte (0-basiert)
+    VideoCall            ; Rückgabe: DH=Zeile, DL=Spalte (0-basiert)
     mov  [PTR16(dos_ypos)], dh
     mov  [PTR16(dos_xpos)], dl
 

src/_internal/shared/PutStrColor.asm

@@ -132,7 +132,7 @@ code16_start:
     
     pop  dx
     
-    SET_CURSOR 40, 5
+    SET_CURSOR 40, 3
     PUTS_COLOR command_args, 0x0E | 0x10
     DOS_Exit cx
     

src/_internal/shared/code16.asm

@@ -22,6 +22,13 @@
     int 0x21        ; DOS interrupt 0x21
 %endif
 %endmacro
+%macro VideoCall 0
+%if DOS_SHELL == 1
+    int 0x10
+%else
+    %error 'only DOS supports interrupts.'
+%endif
+%endmacro
 
 ; -----------------------------------------------------------------------------
 ; add win64 abi shadow ...

src/_internal/shared/dos.exe

@@ -503,7 +503,7 @@
 %macro SET_COLOR_TO 2
 %if %0 == 2
     STRCPY_ANSI buffer_B, consoleColor_1, empty
-    STRCAT_ANSI buffer_B,                         \
+    STRCAT_ANSI buffer_B,                     \
                 console_color_%1, buffer_semi,\
                 console_color_%2, consoleColor_2
     WRITE_CON_A buffer_B
@@ -648,3 +648,13 @@
     SysCall
 %endif
 %endmacro
+
+; -----------------------------------------
+; COMPARE <reg>, <imm>, <label>
+; Beispiel: COMPARE al, 0x0a, printed
+; Macht:   cmp <reg>, <imm>  /  je <label>
+; -----------------------------------------
+%macro COMPARE 3
+    cmp %1, %2
+    je  %3
+%endmacro