Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-22 21:58:57 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix the i386 disassembler duplication.

Browse Source
This commit is contained in:
Olivier Galibert 2009-08-22 19:55:33 +00:00
parent 52ab73d4de
commit 26dee2df8e
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emu/cpu/cpu.mak
View File

@ -48,7 +48,7 @@ ifdef PTR64
DRCOBJ += \ DRCOBJ += \
$(CPUOBJ)/drcbex64.o \ $(CPUOBJ)/drcbex64.o \
$(CPUOBJ)/x86log.o $(CPUOBJ)/x86log.o $(CPUOBJ)/i386/i386dasm.o
DRCDEPS += \ DRCDEPS += \
$(CPUSRC)/x86emit.h $(CPUSRC)/x86emit.h
@ -59,7 +59,7 @@ else
DRCOBJ += \ DRCOBJ += \
$(CPUOBJ)/drcbex86.o \ $(CPUOBJ)/drcbex86.o \
$(CPUOBJ)/x86log.o $(CPUOBJ)/x86log.o $(CPUOBJ)/i386/i386dasm.o
DRCDEPS += \ DRCDEPS += \
$(CPUSRC)/x86emit.h $(CPUSRC)/x86emit.h

16
src/emu/cpu/x86log.c
View File

@ -74,7 +74,7 @@ struct _x86log_context
***************************************************************************/ ***************************************************************************/
static void reset_log(x86log_context *log); static void reset_log(x86log_context *log);
static int x86log_i386_dasm_one_ex(char *buffer, UINT64 eip, const UINT8 *oprom, int mode); extern int i386_dasm_one(char *buffer, UINT64 eip, const UINT8 *oprom, int mode);
@ -237,9 +237,9 @@ void x86log_disasm_code_range(x86log_context *log, const char *label, x86code *s
else else
{ {
#ifdef PTR64 #ifdef PTR64
bytes = x86log_i386_dasm_one_ex(buffer, (FPTR)cur, cur, 64) & DASMFLAG_LENGTHMASK; bytes = i386_dasm_one(buffer, (FPTR)cur, cur, 64) & DASMFLAG_LENGTHMASK;
#else #else
bytes = x86log_i386_dasm_one_ex(buffer, (FPTR)cur, cur, 32) & DASMFLAG_LENGTHMASK; bytes = i386_dasm_one(buffer, (FPTR)cur, cur, 32) & DASMFLAG_LENGTHMASK;
#endif #endif
} }
@ -305,13 +305,3 @@ static void reset_log(x86log_context *log)
log->comment_count = 0; log->comment_count = 0;
log->comment_pool_next = log->comment_pool; log->comment_pool_next = log->comment_pool;
} }
/***************************************************************************
DISASSEMBLERS
***************************************************************************/
#define i386_dasm_one x86log_i386_dasm_one
#define i386_dasm_one_ex x86log_i386_dasm_one_ex
#include "cpu/i386/i386dasm.c"