diff options
Diffstat (limited to 'src/devices/cpu/i386/i386priv.h')
-rw-r--r-- | src/devices/cpu/i386/i386priv.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/devices/cpu/i386/i386priv.h b/src/devices/cpu/i386/i386priv.h index 6831407e23d..3e5ea5b70f8 100644 --- a/src/devices/cpu/i386/i386priv.h +++ b/src/devices/cpu/i386/i386priv.h @@ -1,9 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Ville Linde, Barry Rodewald, Carl, Philip Bennett -#pragma once +#ifndef MAME_CPU_I386_I386PRIV_H +#define MAME_CPU_I386_I386PRIV_H -#ifndef __I386_H__ -#define __I386_H__ +#pragma once #include "i386dasm.h" @@ -297,11 +297,11 @@ extern int i386_parity_table[256]; #define FAULT_THROW(fault,error) { throw (uint64_t)(fault | (uint64_t)error << 32); } #define PF_THROW(error) { m_cr[2] = address; FAULT_THROW(FAULT_PF,error); } -#define PROTECTED_MODE (m_cr[0] & 0x1) +#define PROTECTED_MODE (m_cr[0] & CR0_PE) #define STACK_32BIT (m_sreg[SS].d) #define V8086_MODE (m_VM) #define NESTED_TASK (m_NT) -#define WP (m_cr[0] & 0x10000) +#define WP (m_cr[0] & CR0_WP) #define SetOF_Add32(r,s,d) (m_OF = (((r) ^ (s)) & ((r) ^ (d)) & 0x80000000) ? 1: 0) #define SetOF_Add16(r,s,d) (m_OF = (((r) ^ (s)) & ((r) ^ (d)) & 0x8000) ? 1 : 0) @@ -327,7 +327,7 @@ extern int i386_parity_table[256]; #define MMX(n) (*((MMX_REG *)(&m_x87_reg[(n)].low))) #define XMM(n) m_sse_reg[(n)] -#define VTLB_FLAG_DIRTY 0x100 +#define FLAG_DIRTY 0x100 // VTLB flag #define CYCLES_NUM(x) (m_cycles -= (x)) #define FAULT(fault,error) {m_ext = 1; i386_trap_with_error(fault,0,0,error); return;} @@ -368,8 +368,6 @@ extern MODRM_TABLE i386_MODRM_table[256]; #define STORE_RM16(x, value) (REG16(i386_MODRM_table[x].rm.w) = value) #define STORE_RM32(x, value) (REG32(i386_MODRM_table[x].rm.d) = value) -#define SWITCH_ENDIAN_32(x) (((((x) << 24) & (0xff << 24)) | (((x) << 8) & (0xff << 16)) | (((x) >> 8) & (0xff << 8)) | (((x) >> 24) & (0xff << 0)))) - /***********************************************************************************/ enum X86_CYCLES @@ -726,4 +724,4 @@ enum X86_CYCLES #define OP_4BYTE3AF2 0x00400000 #define OP_4BYTE38F3 0x00200000 -#endif /* __I386_H__ */ +#endif // MAME_CPU_I386_I386PRIV_H |