GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-18 21:21:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the function conflict in x86emu when DEBUG is on

Browse source 
The function parse_line() in common/main.c was exposed globally by commit
6636b62a6e, Result in conflict with the same
name funciton in drivers/bios_emulator/x86emu/debug.c when define the DEBUG.
This patch fix this by renaming the function in the debug.c file.

Signed-off-by: Jason Jin <Jason.jin@freescale.com>
This commit is contained in:
Jason Jin 2008-10-15 10:40:24 +08:00 • committed by Wolfgang Denk
parent 6971009217
commit 9029b68f3f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/bios_emulator/x86emu/debug.c
View file

@ -50,7 +50,7 @@
static void print_encoded_bytes(u16 s, u16 o); static void print_encoded_bytes(u16 s, u16 o);
static void print_decoded_instruction(void); static void print_decoded_instruction(void);
static int parse_line(char *s, int *ps, int *n); static int x86emu_parse_line(char *s, int *ps, int *n);
/* should look something like debug's output. */ /* should look something like debug's output. */
void X86EMU_trace_regs(void) void X86EMU_trace_regs(void)
@ -257,7 +257,7 @@ void x86emu_single_step(void)
offset = M.x86.saved_ip; offset = M.x86.saved_ip;
while (!done) { while (!done) {
printk("-"); printk("-");
cmd = parse_line(s, ps, &ntok); cmd = x86emu_parse_line(s, ps, &ntok);
switch (cmd) { switch (cmd) {
case 'u': case 'u':
disassemble_forward(M.x86.saved_cs, (u16) offset, 10); disassemble_forward(M.x86.saved_cs, (u16) offset, 10);
@ -331,7 +331,7 @@ int X86EMU_trace_off(void)
return M.x86.debug &= ~(DEBUG_STEP_F | DEBUG_DECODE_F | DEBUG_TRACE_F); return M.x86.debug &= ~(DEBUG_STEP_F | DEBUG_DECODE_F | DEBUG_TRACE_F);
} }
static int parse_line(char *s, int *ps, int *n) static int x86emu_parse_line(char *s, int *ps, int *n)
{ {
int cmd; int cmd;