--- qemu/roms/seabios/src/bregs.h	2018/04/24 17:36:48	1.1.1.1
+++ qemu/roms/seabios/src/bregs.h	2018/04/24 19:24:04	1.1.1.3
@@ -37,9 +37,9 @@
 struct bregs {
     u16 ds;
     u16 es;
-    UREG(edi, di, di_hi, di_lo);
-    UREG(esi, si, si_hi, si_lo);
-    UREG(ebp, bp, bp_hi, bp_lo);
+    UREG(edi, di, di8u, di8l);
+    UREG(esi, si, si8u, si8l);
+    UREG(ebp, bp, bp8u, bp8l);
     UREG(ebx, bx, bh, bl);
     UREG(edx, dx, dh, dl);
     UREG(ecx, cx, ch, cl);
@@ -91,29 +91,6 @@ set_code_invalid_silent(struct bregs *re
     set_cf(regs, 1);
 }
 
-#define warn_invalid(regs)                      \
-    __warn_invalid((regs), __LINE__, __func__)
-#define set_invalid(regs)                       \
-    __set_invalid((regs), __LINE__, __func__)
-#define set_code_invalid(regs, code)                                    \
-    __set_code_invalid((regs), (code) | (__LINE__ << 8), __func__)
-
-#define warn_unimplemented(regs)                        \
-    __warn_unimplemented((regs), __LINE__, __func__)
-#define set_unimplemented(regs)                         \
-    __set_unimplemented((regs), __LINE__, __func__)
-#define set_code_unimplemented(regs, code)                              \
-    __set_code_unimplemented((regs), (code) | (__LINE__ << 8), __func__)
-
-// output.c
-void __warn_invalid(struct bregs *regs, int lineno, const char *fname);
-void __warn_unimplemented(struct bregs *regs, int lineno, const char *fname);
-void __set_invalid(struct bregs *regs, int lineno, const char *fname);
-void __set_unimplemented(struct bregs *regs, int lineno, const char *fname);
-void __set_code_invalid(struct bregs *regs, u32 linecode, const char *fname);
-void __set_code_unimplemented(struct bregs *regs, u32 linecode
-                              , const char *fname);
-
 #endif // !__ASSEMBLY__
 
 #endif // bregs.h