From 26dee2df8e8aac6e2909d22435feeda3cc413930 Mon Sep 17 00:00:00 2001
From: Olivier Galibert <galibert@pobox.com>
Date: Sat, 22 Aug 2009 19:55:33 +0000
Subject: [PATCH] Fix the i386 disassembler duplication.

---
 src/emu/cpu/cpu.mak  |  4 ++--
 src/emu/cpu/x86log.c | 16 +++-------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak
index 4fcb7818ac6..59a7ce3754a 100644
--- a/src/emu/cpu/cpu.mak
+++ b/src/emu/cpu/cpu.mak
@@ -48,7 +48,7 @@ ifdef PTR64
 
 DRCOBJ += \
 	$(CPUOBJ)/drcbex64.o \
-	$(CPUOBJ)/x86log.o
+	$(CPUOBJ)/x86log.o $(CPUOBJ)/i386/i386dasm.o
 
 DRCDEPS += \
 	$(CPUSRC)/x86emit.h
@@ -59,7 +59,7 @@ else
 
 DRCOBJ += \
 	$(CPUOBJ)/drcbex86.o \
-	$(CPUOBJ)/x86log.o
+	$(CPUOBJ)/x86log.o $(CPUOBJ)/i386/i386dasm.o
 
 DRCDEPS += \
 	$(CPUSRC)/x86emit.h
diff --git a/src/emu/cpu/x86log.c b/src/emu/cpu/x86log.c
index d961387a1ba..28306b3ae78 100644
--- a/src/emu/cpu/x86log.c
+++ b/src/emu/cpu/x86log.c
@@ -74,7 +74,7 @@ struct _x86log_context
 ***************************************************************************/
 
 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
 		{
 #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
-			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
 		}
 
@@ -305,13 +305,3 @@ static void reset_log(x86log_context *log)
 	log->comment_count = 0;
 	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"