diff options
author | 2018-01-18 09:52:18 +0100 | |
---|---|---|
committer | 2018-01-18 10:16:08 +0100 | |
commit | 8c05eabdca6543bf77f02c6d62594eb717f30c01 (patch) | |
tree | 4ee204ad85c79c27c0841c1bea42b2b0e6ff7a45 /src/devices/cpu/i86/i286.cpp | |
parent | d2aa8944d97b847ce62bacf450b6fd087fee7e39 (diff) |
Flushing some stuff... (nw)
Diffstat (limited to 'src/devices/cpu/i86/i286.cpp')
-rw-r--r-- | src/devices/cpu/i86/i286.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/devices/cpu/i86/i286.cpp b/src/devices/cpu/i86/i286.cpp index c3418b16efc..e3eeca0d53b 100644 --- a/src/devices/cpu/i86/i286.cpp +++ b/src/devices/cpu/i86/i286.cpp @@ -592,7 +592,7 @@ void i80286_cpu_device::switch_task(uint16_t ntask, int type) uint8_t r, lr; uint32_t naddr, oaddr, ldtaddr; int i; - logerror("i286: %06x This program uses TSSs, how rare. Please report this to the developers.\n", pc()); + logerror("i286: %06x This program uses TSSs, how rare. Please report this to the developers.\n", m_pc); if(TBL(ntask)) throw TRAP(FAULT_TS, IDXTBL(ntask)); @@ -1026,7 +1026,7 @@ uint8_t i80286_cpu_device::fetch_op() if(m_ip > m_limit[CS]) throw TRAP(FAULT_GP, 0); - data = m_direct_opcodes->read_byte( pc() & m_amask, m_fetch_xor ); + data = m_direct_opcodes->read_byte( update_pc() & m_amask, m_fetch_xor ); m_ip++; return data; } @@ -1037,7 +1037,7 @@ uint8_t i80286_cpu_device::fetch() if(m_ip > m_limit[CS]) throw TRAP(FAULT_GP, 0); - data = m_direct_opcodes->read_byte( pc() & m_amask, m_fetch_xor ); + data = m_direct_opcodes->read_byte( update_pc() & m_amask, m_fetch_xor ); m_ip++; return data; } @@ -1112,7 +1112,7 @@ void i80286_cpu_device::execute_run() } } - debugger_instruction_hook( this, pc() & m_amask ); + debugger_instruction_hook( this, update_pc() & m_amask ); uint8_t op = fetch_op(); @@ -1428,7 +1428,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); } if (tmp<low || tmp>high) interrupt(5); CLK(BOUND); - logerror("%06x: bound %04x high %04x low %04x tmp\n", pc(), high, low, tmp); + logerror("%06x: bound %04x high %04x low %04x tmp\n", m_pc, high, low, tmp); } break; @@ -1505,7 +1505,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); } m_modrm = fetch(); if((m_modrm & 0x38) > 0x18) { - logerror("%06x: Mov Sreg - Invalid register\n", pc()); + logerror("%06x: Mov Sreg - Invalid register\n", m_pc); throw TRAP(FAULT_UD, (uint16_t)-1); } PutRMWord(m_sregs[(m_modrm & 0x38) >> 3]); @@ -1529,7 +1529,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); } data_descriptor(DS, m_src); break; default: - logerror("%06x: Mov Sreg - Invalid register\n", pc()); + logerror("%06x: Mov Sreg - Invalid register\n", m_pc); throw TRAP(FAULT_UD, (uint16_t)-1); } break; @@ -1792,7 +1792,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); } case 0xf0: // i_lock if(PM && (CPL > m_IOPL)) throw TRAP(FAULT_GP, 0); - logerror("%06x: Warning - BUSLOCK\n", pc()); + logerror("%06x: Warning - BUSLOCK\n", m_pc); m_no_interrupt = 1; CLK(NOP); break; @@ -1869,7 +1869,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); } CLKM(PUSH_R16,PUSH_M16); break; default: - logerror("%06x: FF Pre with unimplemented mod\n", pc()); + logerror("%06x: FF Pre with unimplemented mod\n", m_pc); throw TRAP(FAULT_UD,(uint16_t)-1); } } @@ -1905,7 +1905,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); } if(!common_op(op)) { m_icount -= 10; // UD fault timing? - logerror("%06x: Invalid Opcode %02x\n", pc(), op); + logerror("%06x: Invalid Opcode %02x\n", m_pc, op); m_ip = m_prev_ip; throw TRAP(FAULT_UD, (uint16_t)-1); } |