--- np2/i386c/ia32/ia32.mcr 2004/05/22 16:35:07 1.19 +++ np2/i386c/ia32/ia32.mcr 2011/12/21 18:07:57 1.29 @@ -1,5 +1,3 @@ -/* $Id: ia32.mcr,v 1.19 2004/05/22 16:35:07 monaka Exp $ */ - /* * Copyright (c) 2002-2003 NONAKA Kimihiro * All rights reserved. @@ -12,8 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -37,8 +33,12 @@ #define __CBD(src) ((UINT32)((SINT8)(src))) #define __CWDE(src) ((SINT16)(src)) +#ifndef PTR_TO_UINT32 #define PTR_TO_UINT32(p) ((UINT32)((unsigned long)(p))) -#define UINT32_TO_PTR(v) ((void *)((unsigned long)(v))) +#endif +#ifndef UINT32_TO_PTR +#define UINT32_TO_PTR(v) ((void *)((unsigned long)(UINT32)(v))) +#endif #define SWAP_BYTE(p, q) \ do { \ @@ -72,7 +72,7 @@ do { \ #define CPU_HALT() \ do { \ - CPU_REMCLOCK = -1; \ + CPU_REMCLOCK = -1; \ } while (/*CONSTCOND*/ 0) #define IRQCHECKTERM() \ @@ -87,18 +87,8 @@ do { \ /* * instruction pointer */ -#define SET_EIP(v) \ -do { \ - UINT32 __new_ip = (v); \ - if (__new_ip > CPU_STAT_CS_LIMIT) { \ - VERBOSE(("SET_EIP: new_ip = %08x, limit = %08x", __new_ip, CPU_STAT_CS_LIMIT)); \ - EXCEPTION(GP_EXCEPTION, 0); \ - } \ - CPU_EIP = __new_ip; \ - CPU_PREFETCH_CLEAR(); \ -} while (/*CONSTCOND*/ 0) - -#define ADD_EIP(v) \ +/* コードフェッチに使用するので、OpSize の影響を受けてはいけない */ +#define _ADD_EIP(v) \ do { \ UINT32 __tmp_ip = CPU_EIP + (v); \ if (!CPU_STATSAVE.cpu_inst_default.op_32) { \ @@ -107,41 +97,40 @@ do { \ CPU_EIP = __tmp_ip; \ } while (/*CONSTCOND*/ 0) - #define GET_PCBYTE(v) \ do { \ (v) = cpu_codefetch(CPU_EIP); \ - ADD_EIP(1); \ + _ADD_EIP(1); \ } while (/*CONSTCOND*/ 0) #define GET_PCBYTES(v) \ do { \ (v) = __CBW(cpu_codefetch(CPU_EIP)); \ - ADD_EIP(1); \ + _ADD_EIP(1); \ } while (/*CONSTCOND*/ 0) #define GET_PCBYTESD(v) \ do { \ (v) = __CBD(cpu_codefetch(CPU_EIP)); \ - ADD_EIP(1); \ + _ADD_EIP(1); \ } while (/*CONSTCOND*/ 0) #define GET_PCWORD(v) \ do { \ (v) = cpu_codefetch_w(CPU_EIP); \ - ADD_EIP(2); \ + _ADD_EIP(2); \ } while (/*CONSTCOND*/ 0) #define GET_PCWORDS(v) \ do { \ (v) = __CWDE(cpu_codefetch_w(CPU_EIP)); \ - ADD_EIP(2); \ + _ADD_EIP(2); \ } while (/*CONSTCOND*/ 0) #define GET_PCDWORD(v) \ do { \ (v) = cpu_codefetch_d(CPU_EIP); \ - ADD_EIP(4); \ + _ADD_EIP(4); \ } while (/*CONSTCOND*/ 0) #define PREPART_EA_REG8(b, d_s) \ @@ -706,48 +695,48 @@ do { \ */ #define REGPUSH(reg, clock) \ do { \ - UINT16 new_sp = CPU_SP - 2; \ - cpu_vmemorywrite_w(CPU_SS_INDEX, new_sp, reg); \ - CPU_SP = new_sp; \ + UINT16 __new_sp = CPU_SP - 2; \ CPU_WORKCLOCK(clock); \ + cpu_vmemorywrite_w(CPU_SS_INDEX, __new_sp, reg); \ + CPU_SP = __new_sp; \ } while (/*CONSTCOND*/ 0) #define REGPUSH_32(reg, clock) \ do { \ - UINT32 new_esp = CPU_ESP - 4; \ - cpu_vmemorywrite_d(CPU_SS_INDEX, new_esp, reg); \ - CPU_ESP = new_esp; \ + UINT32 __new_esp = CPU_ESP - 4; \ CPU_WORKCLOCK(clock); \ + cpu_vmemorywrite_d(CPU_SS_INDEX, __new_esp, reg); \ + CPU_ESP = __new_esp; \ } while (/*CONSTCOND*/ 0) #define REGPUSH0(reg) \ do { \ - UINT16 new_sp = CPU_SP - 2; \ - cpu_vmemorywrite_w(CPU_SS_INDEX, new_sp, (UINT16)reg); \ - CPU_SP = new_sp; \ + UINT16 __new_sp = CPU_SP - 2; \ + cpu_vmemorywrite_w(CPU_SS_INDEX, __new_sp, (UINT16)reg); \ + CPU_SP = __new_sp; \ } while (/*CONSTCOND*/ 0) /* Operand Size == 16 && Stack Size == 32 */ #define REGPUSH0_16_32(reg) \ do { \ - UINT32 new_esp = CPU_ESP - 2; \ - cpu_vmemorywrite_w(CPU_SS_INDEX, new_esp, (UINT16)reg); \ - CPU_ESP = new_esp; \ + UINT32 __new_esp = CPU_ESP - 2; \ + cpu_vmemorywrite_w(CPU_SS_INDEX, __new_esp, (UINT16)reg); \ + CPU_ESP = __new_esp; \ } while (/*CONSTCOND*/ 0) /* Operand Size == 32 && Stack Size == 16 */ #define REGPUSH0_32_16(reg) \ do { \ - UINT16 new_sp = CPU_SP - 4; \ - cpu_vmemorywrite_d(CPU_SS_INDEX, new_sp, reg); \ - CPU_SP = new_sp; \ + UINT16 __new_sp = CPU_SP - 4; \ + cpu_vmemorywrite_d(CPU_SS_INDEX, __new_sp, reg); \ + CPU_SP = __new_sp; \ } while (/*CONSTCOND*/ 0) #define REGPUSH0_32(reg) \ do { \ - UINT32 new_esp = CPU_ESP - 4; \ - cpu_vmemorywrite_d(CPU_SS_INDEX, new_esp, reg); \ - CPU_ESP = new_esp; \ + UINT32 __new_esp = CPU_ESP - 4; \ + cpu_vmemorywrite_d(CPU_SS_INDEX, __new_esp, reg); \ + CPU_ESP = __new_esp; \ } while (/*CONSTCOND*/ 0) #define PUSH0_16(reg) \ @@ -779,16 +768,16 @@ do { \ #define REGPOP(reg, clock) \ do { \ + CPU_WORKCLOCK(clock); \ (reg) = cpu_vmemoryread_w(CPU_SS_INDEX, CPU_SP); \ CPU_SP += 2; \ - CPU_WORKCLOCK(clock); \ } while (/*CONSTCOND*/ 0) #define REGPOP_32(reg, clock) \ do { \ + CPU_WORKCLOCK(clock); \ (reg) = cpu_vmemoryread_d(CPU_SS_INDEX, CPU_ESP); \ CPU_ESP += 4; \ - CPU_WORKCLOCK(clock); \ } while (/*CONSTCOND*/ 0) #define REGPOP0(reg) \ @@ -838,44 +827,44 @@ do { \ */ #define SP_PUSH_16(reg) \ do { \ - UINT16 sp = CPU_SP; \ + UINT16 __sp = CPU_SP; \ if (!CPU_STAT_SS32) { \ - REGPUSH0(sp); \ + REGPUSH0(__sp); \ } else { \ - REGPUSH0_16_32(sp); \ + REGPUSH0_16_32(__sp); \ } \ } while (/*CONSTCOND*/ 0) #define ESP_PUSH_32(reg) \ do { \ - UINT32 sp = CPU_ESP; \ + UINT32 __esp = CPU_ESP; \ if (!CPU_STAT_SS32) { \ - REGPUSH0_32_16(sp); \ + REGPUSH0_32_16(__esp); \ } else { \ - REGPUSH0_32(sp); \ + REGPUSH0_32(__esp); \ } \ } while (/*CONSTCOND*/ 0) #define SP_POP_16(reg) \ do { \ - UINT32 sp; \ + UINT32 __sp; \ if (!CPU_STAT_SS32) { \ - sp = CPU_SP; \ + __sp = CPU_SP; \ } else { \ - sp = CPU_ESP; \ + __sp = CPU_ESP; \ } \ - CPU_SP = cpu_vmemoryread_w(CPU_SS_INDEX, sp); \ + CPU_SP = cpu_vmemoryread_w(CPU_SS_INDEX, __sp); \ } while (/*CONSTCOND*/ 0) #define ESP_POP_32(reg) \ do { \ - UINT32 sp; \ + UINT32 __esp; \ if (!CPU_STAT_SS32) { \ - sp = CPU_SP; \ + __esp = CPU_SP; \ } else { \ - sp = CPU_ESP; \ + __esp = CPU_ESP; \ } \ - CPU_ESP = cpu_vmemoryread_d(CPU_SS_INDEX, sp); \ + CPU_ESP = cpu_vmemoryread_d(CPU_SS_INDEX, __esp); \ } while (/*CONSTCOND*/ 0) @@ -884,48 +873,51 @@ do { \ */ #define JMPSHORT(clock) \ do { \ - UINT32 __ip; \ + UINT32 __new_ip; \ + UINT32 __dest; \ CPU_WORKCLOCK(clock); \ - __ip = __CBD(cpu_codefetch(CPU_EIP)); \ - __ip++; \ - ADD_EIP(__ip); \ - CPU_PREFETCH_CLEAR(); \ + GET_PCBYTESD(__dest); \ + __new_ip = CPU_EIP + __dest; \ + if (!CPU_INST_OP32) { \ + __new_ip &= 0xffff; \ + } \ + if (__new_ip > CPU_STAT_CS_LIMIT) { \ + EXCEPTION(GP_EXCEPTION, 0); \ + } \ + CPU_EIP = __new_ip; \ } while (/*CONSTCOND*/ 0) #define JMPNEAR(clock) \ do { \ - UINT32 __ip; \ + UINT16 __new_ip; \ + SINT16 __dest; \ CPU_WORKCLOCK(clock); \ - __ip = __CWDE(cpu_codefetch_w(CPU_EIP)); \ - __ip += 2; \ - ADD_EIP(__ip); \ - CPU_PREFETCH_CLEAR(); \ + GET_PCWORDS(__dest); \ + __new_ip = CPU_IP + __dest; \ + if (__new_ip > CPU_STAT_CS_LIMIT) { \ + EXCEPTION(GP_EXCEPTION, 0); \ + } \ + CPU_EIP = __new_ip; \ } while (/*CONSTCOND*/ 0) -#define JMPNEAR_4(clock) \ +#define JMPNEAR32(clock) \ do { \ - UINT32 __ip; \ + UINT32 __new_ip; \ + UINT32 __dest; \ CPU_WORKCLOCK(clock); \ - __ip = cpu_codefetch_d(CPU_EIP); \ - __ip += 4; \ - ADD_EIP(__ip); \ - CPU_PREFETCH_CLEAR(); \ + GET_PCDWORD(__dest); \ + __new_ip = CPU_EIP + __dest; \ + if (__new_ip > CPU_STAT_CS_LIMIT) { \ + EXCEPTION(GP_EXCEPTION, 0); \ + } \ + CPU_EIP = __new_ip; \ } while (/*CONSTCOND*/ 0) -#if !defined(IA32_SUPPORT_PREFETCH_QUEUE) -#define JMPNOP(clock, d) \ -do { \ - CPU_WORKCLOCK(clock); \ - ADD_EIP((d)); \ -} while (/*CONSTCOND*/ 0) -#else #define JMPNOP(clock, d) \ do { \ CPU_WORKCLOCK(clock); \ - CPU_PREFETCHQ_REMAIN -= (d); \ - ADD_EIP((d)); \ + _ADD_EIP((d)); \ } while (/*CONSTCOND*/ 0) -#endif /*