Make sure we use calll/retl for the C code, so the stack frame layout

matches the one used in 32-bit mode.

diff --git a/memdisk/Makefile b/memdisk/Makefile
index 2516478..83b2210 100644 (file)
--- a/memdisk/Makefile
+++ b/memdisk/Makefile
@@ -33,7 +33,8 @@ clean:
        $(AS) -o $@ $<
 
 %.s16: %.s
-       echo '.code16' | cat - $< > $@
+       echo '.code16' > $@
+       sed -e 's/\bcall\b/calll/g' -e 's/\bret\b/retl/g' < $< >> $@
 
 %.s: %.S
        $(CC) -x c $(CFLAGS) -Wp,-traditional -E -o $@ $<

diff --git a/memdisk/conio.c b/memdisk/conio.c
index 5e6cc66..744dc52 100644 (file)
--- a/memdisk/conio.c
+++ b/memdisk/conio.c
@@ -17,6 +17,7 @@
  * Output to the screen
  */
 
+#include <stdint.h>
 #include "conio.h"
 
 int putchar(int ch)
@@ -25,8 +26,8 @@ int putchar(int ch)
     putchar('\r');             /* \n -> \r\n */
 
   asm volatile("int $0x10"
-              :: "a" (0x1400|(ch&0xff)),
-              "b" (0x07)
+              :: "a" ((uint16_t)(0x0e00|(ch&0xff))),
+              "b" ((uint16_t)0x07)
               : "eax", "ebx", "ecx", "edx",
               "esi", "edi", "ebp");
 
@@ -40,6 +41,7 @@ int puts(const char *s)
   while ( *s ) {
     putchar(*s);
     count++;
+    s++;
   }
 
   return count;

diff --git a/memdisk/init.S16 b/memdisk/init.S16
index 0231d8f..465d63b 100644 (file)
--- a/memdisk/init.S16
+++ b/memdisk/init.S16
@@ -127,7 +127,7 @@ start:
 
 main:
                sti
-               call setup              # Call the C code
+               calll setup             # Call the C code
                # The setup function returns the drive number,
                # which should be returned in %dl
                movw %ax,%dx