frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86emu: constify debug strings 

Strings are all pointers to literal constants, just used as input
to printf calls when debugging is enabled.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Alan Coopersmith 2011-12-12 16:49:34 -08:00
parent d5a5eece67
commit 71efd86828
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/x86emu/debug.c
View File

@ -163,13 +163,13 @@ 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 (const char *x)
{ {
sprintf(M.x86.decoded_buf+M.x86.enc_str_pos,"%s",x); sprintf(M.x86.decoded_buf+M.x86.enc_str_pos,"%s",x);
M.x86.enc_str_pos += strlen(x); M.x86.enc_str_pos += strlen(x);
} }
void x86emu_decode_printf2 (char *x, int y) void x86emu_decode_printf2 (const char *x, int y)
{ {
char temp[100]; char temp[100];
snprintf(temp,sizeof(temp),x,y); snprintf(temp,sizeof(temp),x,y);

16
hw/xfree86/x86emu/fpu.c
View File

@ -52,7 +52,7 @@ void x86emuOp_esc_coprocess_d8(u8 X86EMU_UNUSED(op1))
#ifdef DEBUG #ifdef DEBUG
static char *x86emu_fpu_op_d9_tab[] = { static const char *x86emu_fpu_op_d9_tab[] = {
"FLD\tDWORD PTR ", "ESC_D9\t", "FST\tDWORD PTR ", "FSTP\tDWORD PTR ", "FLD\tDWORD PTR ", "ESC_D9\t", "FST\tDWORD PTR ", "FSTP\tDWORD PTR ",
"FLDENV\t", "FLDCW\t", "FSTENV\t", "FSTCW\t", "FLDENV\t", "FLDCW\t", "FSTENV\t", "FSTCW\t",
@ -63,7 +63,7 @@ static char *x86emu_fpu_op_d9_tab[] = {
"FLDENV\t", "FLDCW\t", "FSTENV\t", "FSTCW\t", "FLDENV\t", "FLDCW\t", "FSTENV\t", "FSTCW\t",
}; };
static char *x86emu_fpu_op_d9_tab1[] = { static const char *x86emu_fpu_op_d9_tab1[] = {
"FLD\t", "FLD\t", "FLD\t", "FLD\t", "FLD\t", "FLD\t", "FLD\t", "FLD\t",
"FLD\t", "FLD\t", "FLD\t", "FLD\t", "FLD\t", "FLD\t", "FLD\t", "FLD\t",
@ -299,7 +299,7 @@ void x86emuOp_esc_coprocess_d9(u8 X86EMU_UNUSED(op1))
#ifdef DEBUG #ifdef DEBUG
char *x86emu_fpu_op_da_tab[] = { static const char *x86emu_fpu_op_da_tab[] = {
"FIADD\tDWORD PTR ", "FIMUL\tDWORD PTR ", "FICOM\tDWORD PTR ", "FIADD\tDWORD PTR ", "FIMUL\tDWORD PTR ", "FICOM\tDWORD PTR ",
"FICOMP\tDWORD PTR ", "FICOMP\tDWORD PTR ",
"FISUB\tDWORD PTR ", "FISUBR\tDWORD PTR ", "FIDIV\tDWORD PTR ", "FISUB\tDWORD PTR ", "FISUBR\tDWORD PTR ", "FIDIV\tDWORD PTR ",
@ -392,7 +392,7 @@ void x86emuOp_esc_coprocess_da(u8 X86EMU_UNUSED(op1))
#ifdef DEBUG #ifdef DEBUG
char *x86emu_fpu_op_db_tab[] = { static const char *x86emu_fpu_op_db_tab[] = {
"FILD\tDWORD PTR ", "ESC_DB\t19", "FIST\tDWORD PTR ", "FISTP\tDWORD PTR ", "FILD\tDWORD PTR ", "ESC_DB\t19", "FIST\tDWORD PTR ", "FISTP\tDWORD PTR ",
"ESC_DB\t1C", "FLD\tTBYTE PTR ", "ESC_DB\t1E", "FSTP\tTBYTE PTR ", "ESC_DB\t1C", "FLD\tTBYTE PTR ", "ESC_DB\t1E", "FSTP\tTBYTE PTR ",
@ -513,7 +513,7 @@ void x86emuOp_esc_coprocess_db(u8 X86EMU_UNUSED(op1))
} }
#ifdef DEBUG #ifdef DEBUG
char *x86emu_fpu_op_dc_tab[] = { static const char *x86emu_fpu_op_dc_tab[] = {
"FADD\tQWORD PTR ", "FMUL\tQWORD PTR ", "FCOM\tQWORD PTR ", "FADD\tQWORD PTR ", "FMUL\tQWORD PTR ", "FCOM\tQWORD PTR ",
"FCOMP\tQWORD PTR ", "FCOMP\tQWORD PTR ",
"FSUB\tQWORD PTR ", "FSUBR\tQWORD PTR ", "FDIV\tQWORD PTR ", "FSUB\tQWORD PTR ", "FSUBR\tQWORD PTR ", "FDIV\tQWORD PTR ",
@ -631,7 +631,7 @@ void x86emuOp_esc_coprocess_dc(u8 X86EMU_UNUSED(op1))
#ifdef DEBUG #ifdef DEBUG
static char *x86emu_fpu_op_dd_tab[] = { static const char *x86emu_fpu_op_dd_tab[] = {
"FLD\tQWORD PTR ", "ESC_DD\t29,", "FST\tQWORD PTR ", "FSTP\tQWORD PTR ", "FLD\tQWORD PTR ", "ESC_DD\t29,", "FST\tQWORD PTR ", "FSTP\tQWORD PTR ",
"FRSTOR\t", "ESC_DD\t2D,", "FSAVE\t", "FSTSW\t", "FRSTOR\t", "ESC_DD\t2D,", "FSAVE\t", "FSTSW\t",
@ -734,7 +734,7 @@ void x86emuOp_esc_coprocess_dd(u8 X86EMU_UNUSED(op1))
#ifdef DEBUG #ifdef DEBUG
static char *x86emu_fpu_op_de_tab[] = static const char *x86emu_fpu_op_de_tab[] =
{ {
"FIADD\tWORD PTR ", "FIMUL\tWORD PTR ", "FICOM\tWORD PTR ", "FIADD\tWORD PTR ", "FIMUL\tWORD PTR ", "FICOM\tWORD PTR ",
"FICOMP\tWORD PTR ", "FICOMP\tWORD PTR ",
@ -856,7 +856,7 @@ void x86emuOp_esc_coprocess_de(u8 X86EMU_UNUSED(op1))
#ifdef DEBUG #ifdef DEBUG
static char *x86emu_fpu_op_df_tab[] = { static const char *x86emu_fpu_op_df_tab[] = {
/* mod == 00 */ /* mod == 00 */
"FILD\tWORD PTR ", "ESC_DF\t39\n", "FIST\tWORD PTR ", "FISTP\tWORD PTR ", "FILD\tWORD PTR ", "ESC_DF\t39\n", "FIST\tWORD PTR ", "FISTP\tWORD PTR ",
"FBLD\tTBYTE PTR ", "FILD\tQWORD PTR ", "FBSTP\tTBYTE PTR ", "FBLD\tTBYTE PTR ", "FILD\tQWORD PTR ", "FBSTP\tTBYTE PTR ",

4
hw/xfree86/x86emu/ops2.c
View File

@ -110,7 +110,7 @@ Handles opcode 0x0f,0x80-0x8F
static void x86emuOp2_long_jump(u8 op2) static void x86emuOp2_long_jump(u8 op2)
{ {
s32 target; s32 target;
char *name = NULL; const char *name = NULL;
int cond = 0; int cond = 0;
/* conditional jump to word offset. */ /* conditional jump to word offset. */
@ -204,7 +204,7 @@ static void x86emuOp2_set_byte(u8 op2)
int mod, rl, rh; int mod, rl, rh;
uint destoffset; uint destoffset;
u8 *destreg; u8 *destreg;
char *name = NULL; const char *name = NULL;
int cond = 0; int cond = 0;
START_OF_INSTR(); START_OF_INSTR();

4
hw/xfree86/x86emu/x86emu/debug.h
View File

@ -189,8 +189,8 @@ extern "C" { /* Use "C" linkage when in C++ mode */
#endif #endif
extern void x86emu_inc_decoded_inst_len (int x); extern void x86emu_inc_decoded_inst_len (int x);
extern void x86emu_decode_printf (char *x); extern void x86emu_decode_printf (const char *x);
extern void x86emu_decode_printf2 (char *x, int y); extern void x86emu_decode_printf2 (const char *x, int y);
extern void x86emu_just_disassemble (void); extern void x86emu_just_disassemble (void);
extern void x86emu_single_step (void); extern void x86emu_single_step (void);
extern void x86emu_end_instr (void); extern void x86emu_end_instr (void);