Backup and restore registers when calling out to user funcs.

[seabios.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index 9b4fd3ab3c649f94e5617d29638037cf07ec7729..7c7c6980d87ab30d0bc2a7346fa73a12e6723680 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -144,15 +144,18 @@ static inline u8 readb(const void *addr) {
 #define call16_simpint(nr, peax, pflags) do {                           \
         ASSERT16();                                                     \
         asm volatile(                                                   \
+            "pushl %%ebp\n"                                             \
+            "sti\n"                                                     \
             "stc\n"                                                     \
             "int %2\n"                                                  \
             "pushfl\n"                                                  \
             "popl %1\n"                                                 \
             "cli\n"                                                     \
-            "cld"                                                       \
-            : "+a"(*peax), "=r"(*pflags)                                \
+            "cld\n"                                                     \
+            "popl %%ebp"                                                \
+            : "+a"(*peax), "=c"(*pflags)                                \
             : "i"(nr)                                                   \
-            : "cc", "memory");                                          \
+            : "ebx", "edx", "esi", "edi", "cc", "memory");              \
     } while (0)
 
 // GDT bit manipulation