From: Dirk Behme <dirk.behme@googlemail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot-Users] [PATCH] Add CONFIG_BIOSEMU define to guard all the bios emulator code
Date: Wed, 08 Aug 2007 17:54:11 +0200 [thread overview]
Message-ID: <46B9E723.5000405@googlemail.com> (raw)
In-Reply-To: <11865349062966-git-send-email-Jason.jin@freescale.com>
Jason Jin wrote:
> This patch fix the compile issue on the board that did not enable the bios emulator
>
> Signed-off-by: Jason Jin <Jason.jin@freescale.com>
Acked-by: Dirk Behme <dirk.behme@gmail.com>
> ---
> 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(-)
>
> diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c
> index 2a8e1a0..4c4bc8d 100644
> --- a/drivers/bios_emulator/besys.c
> +++ b/drivers/bios_emulator/besys.c
> @@ -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
> diff --git a/drivers/bios_emulator/bios.c b/drivers/bios_emulator/bios.c
> index ed5437e..7aa1bfb 100644
> --- a/drivers/bios_emulator/bios.c
> +++ b/drivers/bios_emulator/bios.c
> @@ -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
> diff --git a/drivers/bios_emulator/biosemu.c b/drivers/bios_emulator/biosemu.c
> index 06d4ad3..4c3aedf 100644
> --- a/drivers/bios_emulator/biosemu.c
> +++ b/drivers/bios_emulator/biosemu.c
> @@ -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
> diff --git a/drivers/bios_emulator/x86emu/debug.c b/drivers/bios_emulator/x86emu/debug.c
> index 0f58a69..915739c 100644
> --- a/drivers/bios_emulator/x86emu/debug.c
> +++ b/drivers/bios_emulator/x86emu/debug.c
> @@ -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
> diff --git a/drivers/bios_emulator/x86emu/decode.c b/drivers/bios_emulator/x86emu/decode.c
> index 1e2dcfe..879f0a0 100644
> --- a/drivers/bios_emulator/x86emu/decode.c
> +++ b/drivers/bios_emulator/x86emu/decode.c
> @@ -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
> diff --git a/drivers/bios_emulator/x86emu/ops.c b/drivers/bios_emulator/x86emu/ops.c
> index d1380ce..d334fb5 100644
> --- a/drivers/bios_emulator/x86emu/ops.c
> +++ b/drivers/bios_emulator/x86emu/ops.c
> @@ -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
> diff --git a/drivers/bios_emulator/x86emu/ops2.c b/drivers/bios_emulator/x86emu/ops2.c
> index 631a340..81c0d49 100644
> --- a/drivers/bios_emulator/x86emu/ops2.c
> +++ b/drivers/bios_emulator/x86emu/ops2.c
> @@ -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
> diff --git a/drivers/bios_emulator/x86emu/prim_ops.c b/drivers/bios_emulator/x86emu/prim_ops.c
> index e0827d7..c1152ea 100644
> --- a/drivers/bios_emulator/x86emu/prim_ops.c
> +++ b/drivers/bios_emulator/x86emu/prim_ops.c
> @@ -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
> diff --git a/drivers/bios_emulator/x86emu/sys.c b/drivers/bios_emulator/x86emu/sys.c
> index bb7fcd9..566389f 100644
> --- a/drivers/bios_emulator/x86emu/sys.c
> +++ b/drivers/bios_emulator/x86emu/sys.c
> @@ -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
next prev parent reply other threads:[~2007-08-08 15:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-08 1:01 [U-Boot-Users] [PATCH] Add CONFIG_BIOSEMU define to guard all the bios emulator code Jason Jin
2007-08-08 1:01 ` [U-Boot-Users] [PATCH] Minor fix for bios emulator makefile Jason Jin
2007-08-08 15:54 ` Dirk Behme [this message]
-- strict thread matches above, loose matches on Subject: below --
2007-08-08 0:33 [U-Boot-Users] [PATCH] Add CONFIG_BIOSEMU define to guard all the bios emulator code Jason Jin
2007-08-09 21:25 ` Wolfgang Denk
2007-08-07 8:17 Jason Jin
2007-08-07 14:21 ` Jerry Van Baren
2007-08-07 14:41 ` Wolfgang Denk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=46B9E723.5000405@googlemail.com \
--to=dirk.behme@googlemail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.