Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-08 13:53:52 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Create explicit i386dasm include for x86 DRC (nw)

Browse Source
This commit is contained in:
AJR 2017-08-01 00:52:21 -04:00
parent 01decf78b0
commit ac06279df0
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/src/cpu.lua
View File

@ -930,7 +930,7 @@ if (CPUS["MCS96"]~=null) then
end end
-------------------------------------------------- --------------------------------------------------
-- Intel 80x86 series -- Intel 80x86 series (also a dynamic recompiler target)
--@src/devices/cpu/i86/i86.h,CPUS["I86"] = true --@src/devices/cpu/i86/i86.h,CPUS["I86"] = true
--@src/devices/cpu/i86/i286.h,CPUS["I86"] = true --@src/devices/cpu/i86/i286.h,CPUS["I86"] = true
--@src/devices/cpu/i386/i386.h,CPUS["I386"] = true --@src/devices/cpu/i386/i386.h,CPUS["I386"] = true
@ -950,6 +950,7 @@ end
if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RSP"]~=null or CPUS["ARM7"]~=null or CPUS["ADSP21062"]~=null or CPUS["MB86235"]~=null or CPUS["I86"]~=null or CPUS["I386"]~=null or _OPTIONS["with-tools"]) then if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RSP"]~=null or CPUS["ARM7"]~=null or CPUS["ADSP21062"]~=null or CPUS["MB86235"]~=null or CPUS["I86"]~=null or CPUS["I386"]~=null or _OPTIONS["with-tools"]) then
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i386/i386dasm.cpp") table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i386/i386dasm.cpp")
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i386/i386dasm.h")
end end
if (CPUS["I386"]~=null) then if (CPUS["I386"]~=null) then

5
src/devices/cpu/i386/i386dasm.h Normal file
View File

@ -0,0 +1,5 @@
// license:BSD-3-Clause
// copyright-holders:Ville Linde, Peter Ferrie
extern int i386_dasm_one(std::ostream &stream, uint32_t pc, const uint8_t *oprom, int mode);
extern int i386_dasm_one_ex(std::ostream &stream, uint64_t eip, const uint8_t *oprom, int mode);

3
src/devices/cpu/i386/i386priv.h
View File

@ -6,6 +6,7 @@
#define __I386_H__ #define __I386_H__
#include "i386.h" #include "i386.h"
#include "i386dasm.h"
//#define DEBUG_MISSING_OPCODE //#define DEBUG_MISSING_OPCODE
@ -15,8 +16,6 @@
#define MMXOP(XX) mmx_##XX #define MMXOP(XX) mmx_##XX
#define SSEOP(XX) sse_##XX #define SSEOP(XX) sse_##XX
extern int i386_dasm_one(std::ostream &stream, uint32_t pc, const uint8_t *oprom, int mode);
enum SREGS { ES, CS, SS, DS, FS, GS }; enum SREGS { ES, CS, SS, DS, FS, GS };
enum BREGS enum BREGS

2
src/devices/cpu/i86/i86.cpp
View File

@ -15,6 +15,7 @@
#include "i86.h" #include "i86.h"
#include "debugger.h" #include "debugger.h"
#include "i86inline.h" #include "i86inline.h"
#include "cpu/i386/i386dasm.h"
#define I8086_NMI_INT_VECTOR 2 #define I8086_NMI_INT_VECTOR 2
@ -551,7 +552,6 @@ void i8086_common_cpu_device::execute_set_input( int inptnum, int state )
offs_t i8086_common_cpu_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) offs_t i8086_common_cpu_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options)
{ {
extern int i386_dasm_one(std::ostream &stream, offs_t eip, const uint8_t *oprom, int mode);
return i386_dasm_one(stream, pc, oprom, 1); return i386_dasm_one(stream, pc, oprom, 1);
} }

2
src/devices/cpu/x86log.cpp
View File

@ -12,6 +12,7 @@
#include <cassert> #include <cassert>
#include "emu.h" #include "emu.h"
#include "x86log.h" #include "x86log.h"
#include "cpu/i386/i386dasm.h"
@ -20,7 +21,6 @@
***************************************************************************/ ***************************************************************************/
static void reset_log(x86log_context *log) noexcept; static void reset_log(x86log_context *log) noexcept;
extern int i386_dasm_one_ex(std::ostream &stream, uint64_t eip, const uint8_t *oprom, int mode);