Improve set_code_fail/floppy_ret/disk_ret code generation.

[seabios.git] / src / bregs.h

diff --git a/src/bregs.h b/src/bregs.h
index f7060e8a08a0d6536b91053f576e927def31df83..4d6a699fd2b921a3ed79e102e513b8292296e8e9 100644 (file)
--- a/src/bregs.h
+++ b/src/bregs.h
@@ -7,11 +7,26 @@
 #ifndef __BREGS_H
 #define __BREGS_H
 
+// CPU flag bitdefs
+#define F_CF (1<<0)
+#define F_ZF (1<<6)
+#define F_IF (1<<9)
+
+// CR0 flags
+#define CR0_PG (1<<31) // Paging
+#define CR0_CD (1<<30) // Cache disable
+#define CR0_NW (1<<29) // Not Write-through
+#define CR0_PE (1<<0)  // Protection enable
+
+
+#ifndef __ASSEMBLY__
 
 /****************************************************************
  * Registers saved/restored in romlayout.S
  ****************************************************************/
 
+#include "types.h" // u16
+
 #define UREG(ER, R, RH, RL) union { u32 ER; struct { u16 R; u16 R ## _hi; }; struct { u8 RL; u8 RH; u8 R ## _hilo; u8 R ## _hihi; }; }
 
 // Layout of registers passed in to irq handlers.  Note that this
@@ -36,10 +51,6 @@ struct bregs {
  * Helper functions
  ****************************************************************/
 
-// bregs flags bitdefs
-#define F_ZF (1<<6)
-#define F_CF (1<<0)
-
 static inline void
 set_cf(struct bregs *regs, int cond)
 {
@@ -78,13 +89,15 @@ set_code_fail_silent(struct bregs *regs, u8 code)
     set_cf(regs, 1);
 }
 
-#define set_fail(regs) \
-    __set_fail(__func__, __LINE__, (regs))
-#define set_code_fail(regs, code)               \
-    __set_code_fail(__func__, __LINE__, (regs), (code))
+#define set_fail(regs)                          \
+    __set_fail((regs), __LINE__, __func__)
+#define set_code_fail(regs, code)                               \
+    __set_code_fail((regs), (code) | (__LINE__ << 8), __func__)
 
 // output.c
-void __set_fail(const char *fname, int lineno, struct bregs *regs);
-void __set_code_fail(const char *fname, int lineno, struct bregs *regs, u8 code);
+void __set_fail(struct bregs *regs, int lineno, const char *fname);
+void __set_code_fail(struct bregs *regs, u32 linecode, const char *fname);
+
+#endif // !__ASSEMBLY__
 
 #endif // bregs.h