Add CONFIG_BIOSEMU define to guard all the bios emulator code

PATCH New Jason Jin 3 participants 6 messages Aug 7, 2007 – Aug 8, 2007

lore

Share & tools

lore

Jason Jin

author

2007-08-07 08:17 UTC #0 lore raw

PATCH 1/1 Add CONFIG_BIOSEMU define to guard all the bios emulator code

This patch fix the compile issue on the board that did not enable the bios emulator

---
 drivers/bios_emulator/besys.c           |    2 ++
 drivers/bios_emulator/bios.c            |    2 ++
 drivers/bios_emulator/biosemu.c         |    3 +++
 drivers/bios_emulator/x86emu/debug.c    |    4 ++++
 drivers/bios_emulator/x86emu/decode.c   |    4 ++++
 drivers/bios_emulator/x86emu/ops.c      |    5 +++++
 drivers/bios_emulator/x86emu/ops2.c     |    4 ++++
 drivers/bios_emulator/x86emu/prim_ops.c |    4 ++++
 drivers/bios_emulator/x86emu/sys.c      |    4 ++++
 9 files changed, 32 insertions(+), 0 deletions(-)

drivers/bios_emulator/besys.c +2 -0

index 2a8e1a0..4c4bc8d 100644
@@ -49,6 +49,7 @@
 
 #include "biosemui.h"
 
+#if defined(CONFIG_BIOSEMU)
 /*------------------------- Global Variables ------------------------------*/
 
 #ifndef __i386__

@@ -717,3 +718,4 @@ void X86API BE_outl(X86EMU_pioAddr port, u32 val)
 #endif
 		LOG_outpd(port, val);
 }
+#endif

drivers/bios_emulator/bios.c +2 -0

index ed5437e..7aa1bfb 100644
@@ -43,6 +43,7 @@
 
 #include "biosemui.h"
 
+#if defined(CONFIG_BIOSEMU)
 /*----------------------------- Implementation ----------------------------*/
 
 /****************************************************************************

@@ -319,3 +320,4 @@ void _BE_bios_init(u32 * intrTab)
 	bios_intr_tab[0x6D] = int10;
 	X86EMU_setupIntrFuncs(bios_intr_tab);
 }
+#endif

drivers/bios_emulator/biosemu.c +3 -0

index 06d4ad3..4c3aedf 100644
@@ -48,6 +48,8 @@
 #include "biosemui.h"
 #include <malloc.h>
 
+#if defined(CONFIG_BIOSEMU)
+
 BE_sysEnv _BE_env = {{0}};
 static X86EMU_memFuncs _BE_mem __attribute__((section(".got2"))) = {
 	BE_rdb,

@@ -368,3 +370,4 @@ int X86API BE_int86x(int intno, RMREGS * in, RMREGS * out, RMSREGS * sregs)
 	sregs->gs = M.x86.R_GS;
 	return out->x.ax;
 }
+#endif

drivers/bios_emulator/x86emu/debug.c +4 -0

index 0f58a69..915739c 100644
@@ -40,6 +40,8 @@
 #include "x86emu/x86emui.h"
 #include <stdarg.h>
 
+#if defined(CONFIG_BIOSEMU)
+
 /*----------------------------- Implementation ----------------------------*/
 
 #ifdef DEBUG

@@ -459,3 +461,5 @@ void x86emu_dump_xregs(void)
 		printk("NC ");
 	printk("\n");
 }
+
+#endif

drivers/bios_emulator/x86emu/decode.c +4 -0

index 1e2dcfe..879f0a0 100644
@@ -39,6 +39,8 @@
 
 #include "x86emu/x86emui.h"
 
+#if defined(CONFIG_BIOSEMU)
+
 /*----------------------------- Implementation ----------------------------*/
 
 /****************************************************************************

@@ -1142,3 +1144,5 @@ unsigned decode_rmXX_address(int mod, int rm)
     return decode_rm01_address(rm);
   return decode_rm10_address(rm);
 }
+
+#endif

drivers/bios_emulator/x86emu/ops.c +5 -0

index d1380ce..d334fb5 100644
@@ -76,6 +76,9 @@
 ****************************************************************************/
 
 #include "x86emu/x86emui.h"
+
+#if defined(CONFIG_BIOSEMU)
+
 /*----------------------------- Implementation ----------------------------*/
 
 /* constant arrays to do several instructions in just one function */

@@ -5429,3 +5432,5 @@ void (*x86emu_optab[256])(u8) __attribute__ ((section(".got2"))) =
 /*  0xfe */ x86emuOp_opcFE_byte_RM,
 /*  0xff */ x86emuOp_opcFF_word_RM,
 };
+
+#endif

drivers/bios_emulator/x86emu/ops2.c +4 -0

index 631a340..81c0d49 100644
@@ -46,6 +46,8 @@
 
 #include "x86emu/x86emui.h"
 
+#if defined(CONFIG_BIOSEMU)
+
 /*----------------------------- Implementation ----------------------------*/
 
 /****************************************************************************

@@ -1768,3 +1770,5 @@ void (*x86emu_optab2[256])(u8) __attribute__((section(".got2"))) =
 /*  0xfe */ x86emuOp2_illegal_op,
 /*  0xff */ x86emuOp2_illegal_op,
 };
+
+#endif

drivers/bios_emulator/x86emu/prim_ops.c +4 -0

index e0827d7..c1152ea 100644
@@ -100,6 +100,8 @@
 #define PRIM_OPS_NO_REDEFINE_ASM
 #include "x86emu/x86emui.h"
 
+#if defined(CONFIG_BIOSEMU)
+
 /*------------------------- Global Variables ------------------------------*/
 
 static u32 x86emu_parity_tab[8] =

@@ -2443,3 +2445,5 @@ DB( if (CHECK_SP_ACCESS())
     M.x86.R_SP += 4;
     return res;
 }
+
+#endif

drivers/bios_emulator/x86emu/sys.c +4 -0

index bb7fcd9..566389f 100644
@@ -41,6 +41,8 @@
 
 #include "x86emu/x86emui.h"
 
+#if defined(CONFIG_BIOSEMU)
+
 /*------------------------- Global Variables ------------------------------*/
 
 X86EMU_sysEnv _X86EMU_env;	/* Global emulator machine state */

@@ -320,3 +322,5 @@ void X86EMU_prepareForInt(int num)
 	M.x86.R_IP = mem_access_word(num * 4);
 	M.x86.intr = 0;
 }
+
+#endif

Signature · 1 line

1.5.1

Jason Jin

author

2007-08-07 08:17 UTC #1 lore raw

PATCH 1/1 Minor fix for bios emulator makefile

Add $(obj) to LIB avoiding objects be built in the source dir

---
 drivers/bios_emulator/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/bios_emulator/Makefile +1 -1

index ba7d436..586e83b 100644
@@ -1,6 +1,6 @@
 include $(TOPDIR)/config.mk
 
-LIB := libatibiosemu.a
+LIB := $(obj)libatibiosemu.a
 
 X86DIR  = ./x86emu

Signature · 1 line

1.5.1

Wolfgang Denk

2007-08-07 14:37 UTC #2 lore raw

PATCH 1/1 Minor fix for bios emulator makefile

Quoted 21 lines · In message <[email protected]> you wrote:

Add $(obj) to LIB avoiding objects be built in the source dir

---
 drivers/bios_emulator/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/bios_emulator/Makefile +1 -1

index ba7d436..586e83b 100644
@@ -1,6 +1,6 @@
 include $(TOPDIR)/config.mk
 
-LIB := libatibiosemu.a
+LIB := $(obj)libatibiosemu.a
 
 X86DIR  = ./x86emu

Signature · 1 line

1.5.1

Signed-off-by line missing. Please add and repost.

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
It would seem that evil retreats when forcibly confronted
	-- Yarnek of Excalbia, "The Savage Curtain", stardate 5906.5

Jin Zhengxiong-R64188

author

2007-08-08 00:24 UTC #3 lore raw

PATCH 1/1 Minor fix for bios emulator makefile

Quoted 26 lines

-----Original Message-----
From: wd at denx.de [mailto:wd at denx.de]
Sent: Tuesday, August 07, 2007 10:38 PM
To: Jin Zhengxiong-R64188
Cc: u-boot-users at lists.sourceforge.net; Loeliger Jon-LOELIGER
Subject: Re: [PATCH] Minor fix for bios emulator makefile
In message
Quoted 15 lines · <[email protected]> you wrote:
Add $(obj) to LIB avoiding objects be built in the source dir
---
 drivers/bios_emulator/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
(quoted diff) +0 -0
b/drivers/bios_emulator/Makefile index ba7d436..586e83b 100644
drivers/bios_emulator/Makefile +1 -1
@@ -1,6 +1,6 @@
 include $(TOPDIR)/config.mk
 
-LIB := libatibiosemu.a
+LIB := $(obj)libatibiosemu.a
 

Quoted 8 lines

Quoted 6 lines
drivers/bios_emulator/Makefile +0 -1
 X86DIR  = ./x86emu
 
--
1.5.1
Signed-off-by line missing. Please add and repost.

Sorry for that, there's some issue in my sendmail.

Quoted 11 lines

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: 
wd at denx.de It would seem that evil retreats when forcibly confronted
	-- Yarnek of Excalbia, "The Savage Curtain", stardate 5906.5

Jerry Van Baren

2007-08-07 14:21 UTC #4 lore raw

PATCH 1/1 Add CONFIG_BIOSEMU define to guard all the bios emulator code

In reply to Jason Jin

Quoted 2 lines · Jason Jin

This patch fix the compile issue on the board that did not enable the bios emulator
---

Fixes a bad brokenness, should be applied ASAP.

Acked-by Jerry Van Baren <[email protected]>

Quoted 16 lines

 drivers/bios_emulator/besys.c           |    2 ++
 drivers/bios_emulator/bios.c            |    2 ++
 drivers/bios_emulator/biosemu.c         |    3 +++
 drivers/bios_emulator/x86emu/debug.c    |    4 ++++
 drivers/bios_emulator/x86emu/decode.c   |    4 ++++
 drivers/bios_emulator/x86emu/ops.c      |    5 +++++
 drivers/bios_emulator/x86emu/ops2.c     |    4 ++++
 drivers/bios_emulator/x86emu/prim_ops.c |    4 ++++
 drivers/bios_emulator/x86emu/sys.c      |    4 ++++
 9 files changed, 32 insertions(+), 0 deletions(-)

drivers/bios_emulator/besys.c +0 -0

index 2a8e1a0..4c4bc8d 100644

drivers/bios_emulator/besys.c line 52

Quoted 4 lines

drivers/bios_emulator/besys.c +1 -0

@@ -49,6 +49,7 @@
 
 #include "biosemui.h"
 
+#if defined(CONFIG_BIOSEMU)

[snip rest of same]

Wolfgang Denk

2007-08-07 14:41 UTC #5 lore raw

PATCH 1/1 Add CONFIG_BIOSEMU define to guard all the bios emulator code

In reply to Jason Jin

Quoted 2 lines · In message <[email protected]> you wrote:

This patch fix the compile issue on the board that did not enable the bios emulator
---

Signed-off-by line missing. Please add and repost.

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Security is mostly a superstition. It does not  exist  in  nature...
Life is either a daring adventure or nothing."         - Helen Keller