Firebee/BaS_gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added sprintf() to x86emu/debug.c

Browse Source
This commit is contained in:
Markus Fröschle
2013-12-30 10:22:33 +00:00
parent cf3b937e8f
commit 5e5299c456
2 changed files with 9 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/bas_printf.c
View File

@@ -352,7 +352,7 @@ static void doprnt(void (*addchar)(int), const char *sfmt, va_list ap)
static char *xstring, *xestring; static char *xstring, *xestring;
static void xaddchar(int c) void xaddchar(int c)
{ {
if (xestring == xstring) if (xestring == xstring)
*xstring = '\0'; *xstring = '\0';

42
x86emu/debug.c
View File

@@ -154,17 +154,17 @@ void x86emu_check_mem_access(uint32_t dummy)
/* check bounds, etc */ /* check bounds, etc */
} }
void x86emu_check_data_access (unsigned int dummy1, unsigned int dummy2) void x86emu_check_data_access(unsigned int dummy1, unsigned int dummy2)
{ {
/* check bounds, etc */ /* check bounds, etc */
} }
void x86emu_inc_decoded_inst_len (int x) void x86emu_inc_decoded_inst_len(int x)
{ {
M.x86.enc_pos += x; M.x86.enc_pos += x;
} }
void x86emu_decode_printf (char *x) void x86emu_decode_printf(char *x)
{ {
#ifdef DBG_X86EMU #ifdef DBG_X86EMU
strcpy(x, &M.x86.decoded_buf[M.x86.enc_str_pos & 127]); strcpy(x, &M.x86.decoded_buf[M.x86.enc_str_pos & 127]);
@@ -172,44 +172,18 @@ void x86emu_decode_printf (char *x)
#endif #endif
} }
void x86emu_decode_printf2 (char *x, int y) void x86emu_decode_printf2(char *x, int y)
{ {
char temp[100], *p; char temp[100], *p;
doprnt(xaddchar, x, y);
#ifdef DBG_X86EMU #ifdef DBG_X86EMU
{ sprintf(temp, x, y);
p = temp; strcpy(temp, &M.x86.decoded_buf[M.x86.enc_str_pos & 127]);
while (x[0] != 0) M.x86.enc_str_pos += strlen(temp);
{
if (x[0] =='%' && x[1] =='d')
{
x += 2;
Funcs_ltoa(p, y, 10);
while (p[0] != 0)
p++;
}
else if (x[0] == '%' && x[1] == 'x')
{
x += 2;
*p++ = '0';
*p++ = 'x';
y &= 0xffff;
Funcs_ltoa(p, y, 16);
while (p[0] != 0)
p++;
}
else
*p++ = *x++;
}
*p = 0;
strcpy(temp, &M.x86.decoded_buf[M.x86.enc_str_pos & 127]);
M.x86.enc_str_pos += strlen(temp);
}
#endif #endif
} }
void x86emu_end_instr (void) void x86emu_end_instr(void)
{ {
M.x86.enc_str_pos = 0; M.x86.enc_str_pos = 0;
M.x86.enc_pos = 0; M.x86.enc_pos = 0;