281e62d8b1
these from interfering from a normal compile here's what I did.
In config.h.in (which will generate config.h after a configure),
I added a #define called KPL64Hacks:
#define KPL64Hacks
*After* running configure, you must set this by hand. It will
default to off, so you won't get my hacks in a normal compile.
This will go away soon. There is also a macro just after that
called BailBigRSP(). You don't need to enabled that, but you
can. In many of the instructions which seemed like they could
be hit by the fetchdecode64() process, but which also touched
EIP/ESP, I inserted a macro. Usually this macro expands to nothing.
If you like, you can enabled it, and it will panic if it finds
the upper bits of RIP/RSP set. This helped me find bugs.
Also, I cleaned up the emulation in ctrl_xfer{8,16,32}.cc.
There were some really old legacy code snippets which directly
accessed operands on the stack with access_linear. Lots of
ugly code instead of just pop_32() etc. Cleaning those up,
minimized the number of instructions which directly manipulate
the stack pointer, which should help in refining 64-bit support.
264 lines
5.8 KiB
C++
264 lines
5.8 KiB
C++
/////////////////////////////////////////////////////////////////////////
|
|
// $Id: ctrl_xfer8.cc,v 1.11 2002-09-24 00:44:55 kevinlawton Exp $
|
|
/////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Copyright (C) 2001 MandrakeSoft S.A.
|
|
//
|
|
// MandrakeSoft S.A.
|
|
// 43, rue d'Aboukir
|
|
// 75002 Paris - France
|
|
// http://www.linux-mandrake.com/
|
|
// http://www.mandrakesoft.com/
|
|
//
|
|
// This library is free software; you can redistribute it and/or
|
|
// modify it under the terms of the GNU Lesser General Public
|
|
// License as published by the Free Software Foundation; either
|
|
// version 2 of the License, or (at your option) any later version.
|
|
//
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
// Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
// License along with this library; if not, write to the Free Software
|
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
|
|
|
|
#define NEED_CPU_REG_SHORTCUTS 1
|
|
#include "bochs.h"
|
|
#define LOG_THIS BX_CPU_THIS_PTR
|
|
|
|
|
|
|
|
#if BX_SUPPORT_X86_64==0
|
|
// Make life a little easier for the 64/32-bit merge.
|
|
#define RCX ECX
|
|
#define RIP EIP
|
|
#endif
|
|
|
|
|
|
void
|
|
BX_CPU_C::JCXZ_Jb(bxInstruction_c *i)
|
|
{
|
|
BailBigRSP("JCXZ_Jb");
|
|
if (i->as64L()) {
|
|
if ( RCX == 0 ) {
|
|
RIP += (Bit32s) i->Id();
|
|
BX_INSTR_CNEAR_BRANCH_TAKEN(new_RIP);
|
|
revalidate_prefetch_q();
|
|
}
|
|
#if BX_INSTRUMENTATION
|
|
else {
|
|
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN();
|
|
}
|
|
#endif
|
|
}
|
|
else {
|
|
Bit32u temp_ECX;
|
|
|
|
if (i->as32L())
|
|
temp_ECX = ECX;
|
|
else
|
|
temp_ECX = CX;
|
|
|
|
if ( temp_ECX == 0 ) {
|
|
Bit32u new_EIP;
|
|
|
|
new_EIP = EIP + (Bit32s) i->Id();
|
|
if (i->os32L()==0)
|
|
new_EIP &= 0x0000ffff;
|
|
#if BX_CPU_LEVEL >= 2
|
|
if (protected_mode()) {
|
|
if ( new_EIP > BX_CPU_THIS_PTR sregs[BX_SEG_REG_CS].cache.u.segment.limit_scaled ) {
|
|
BX_PANIC(("jcxz_jb: offset outside of CS limits"));
|
|
exception(BX_GP_EXCEPTION, 0, 0);
|
|
}
|
|
}
|
|
#endif
|
|
EIP = new_EIP;
|
|
BX_INSTR_CNEAR_BRANCH_TAKEN(new_EIP);
|
|
revalidate_prefetch_q();
|
|
}
|
|
#if BX_INSTRUMENTATION
|
|
else {
|
|
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN();
|
|
}
|
|
#endif
|
|
}
|
|
}
|
|
|
|
|
|
|
|
void
|
|
BX_CPU_C::LOOPNE_Jb(bxInstruction_c *i)
|
|
{
|
|
BailBigRSP("loopne_jb");
|
|
if (i->as64L()) {
|
|
|
|
if ( ((--RCX)!=0) && (get_ZF()==0) ) {
|
|
|
|
RIP += (Bit32s) i->Id();
|
|
BX_INSTR_CNEAR_BRANCH_TAKEN(RIP);
|
|
revalidate_prefetch_q();
|
|
}
|
|
#if BX_INSTRUMENTATION
|
|
else {
|
|
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN();
|
|
}
|
|
#endif
|
|
}
|
|
else {
|
|
Bit32u count, new_EIP;
|
|
|
|
#if BX_CPU_LEVEL >= 3
|
|
if (i->as32L())
|
|
count = ECX;
|
|
else
|
|
#endif /* BX_CPU_LEVEL >= 3 */
|
|
count = CX;
|
|
|
|
count--;
|
|
if ( (count!=0) && (get_ZF()==0) ) {
|
|
|
|
new_EIP = EIP + (Bit32s) i->Id();
|
|
if (i->os32L()==0)
|
|
new_EIP &= 0x0000ffff;
|
|
if (protected_mode()) {
|
|
if (new_EIP > BX_CPU_THIS_PTR sregs[BX_SEG_REG_CS].cache.u.segment.limit_scaled) {
|
|
BX_PANIC(("loopne_jb: offset outside of CS limits"));
|
|
exception(BX_GP_EXCEPTION, 0, 0);
|
|
}
|
|
}
|
|
EIP = new_EIP;
|
|
BX_INSTR_CNEAR_BRANCH_TAKEN(new_EIP);
|
|
revalidate_prefetch_q();
|
|
}
|
|
#if BX_INSTRUMENTATION
|
|
else {
|
|
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN();
|
|
}
|
|
#endif
|
|
|
|
if (i->as32L())
|
|
RCX = ECX - 1; // zero extend
|
|
else
|
|
CX--;
|
|
}
|
|
}
|
|
|
|
void
|
|
BX_CPU_C::LOOPE_Jb(bxInstruction_c *i)
|
|
{
|
|
BailBigRSP("loope_jb");
|
|
if (i->as64L()) {
|
|
|
|
if ( ((--RCX)!=0) && (get_ZF()) ) {
|
|
|
|
RIP += (Bit32s) i->Id();
|
|
BX_INSTR_CNEAR_BRANCH_TAKEN(RIP);
|
|
revalidate_prefetch_q();
|
|
}
|
|
#if BX_INSTRUMENTATION
|
|
else {
|
|
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN();
|
|
}
|
|
#endif
|
|
}
|
|
else {
|
|
Bit32u count, new_EIP;
|
|
|
|
#if BX_CPU_LEVEL >= 3
|
|
if (i->as32L())
|
|
count = ECX;
|
|
else
|
|
#endif /* BX_CPU_LEVEL >= 3 */
|
|
count = CX;
|
|
|
|
count--;
|
|
if ( (count!=0) && get_ZF()) {
|
|
|
|
new_EIP = EIP + (Bit32s) i->Id();
|
|
if (i->os32L()==0)
|
|
new_EIP &= 0x0000ffff;
|
|
if (protected_mode()) {
|
|
if (new_EIP > BX_CPU_THIS_PTR sregs[BX_SEG_REG_CS].cache.u.segment.limit_scaled) {
|
|
BX_PANIC(("loope_jb: offset outside of CS limits"));
|
|
exception(BX_GP_EXCEPTION, 0, 0);
|
|
}
|
|
}
|
|
EIP = new_EIP;
|
|
BX_INSTR_CNEAR_BRANCH_TAKEN(new_EIP);
|
|
revalidate_prefetch_q();
|
|
}
|
|
#if BX_INSTRUMENTATION
|
|
else {
|
|
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN();
|
|
}
|
|
#endif
|
|
|
|
if (i->as32L())
|
|
RCX = ECX - 1; // zero extend
|
|
else
|
|
CX--;
|
|
}
|
|
}
|
|
|
|
void
|
|
BX_CPU_C::LOOP_Jb(bxInstruction_c *i)
|
|
{
|
|
BailBigRSP("loop_jb");
|
|
if (i->as64L()) {
|
|
|
|
if ( ((--RCX)!=0) ) {
|
|
|
|
RIP += (Bit32s) i->Id();
|
|
BX_INSTR_CNEAR_BRANCH_TAKEN(RIP);
|
|
revalidate_prefetch_q();
|
|
}
|
|
#if BX_INSTRUMENTATION
|
|
else {
|
|
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN();
|
|
}
|
|
#endif
|
|
}
|
|
else {
|
|
Bit32u count, new_EIP;
|
|
|
|
#if BX_CPU_LEVEL >= 3
|
|
if (i->as32L())
|
|
count = ECX;
|
|
else
|
|
#endif /* BX_CPU_LEVEL >= 3 */
|
|
count = CX;
|
|
|
|
count--;
|
|
if (count != 0) {
|
|
|
|
new_EIP = EIP + (Bit32s) i->Id();
|
|
if (i->os32L()==0)
|
|
new_EIP &= 0x0000ffff;
|
|
if (protected_mode()) {
|
|
if (new_EIP > BX_CPU_THIS_PTR sregs[BX_SEG_REG_CS].cache.u.segment.limit_scaled) {
|
|
BX_PANIC(("loop_jb: offset outside of CS limits"));
|
|
exception(BX_GP_EXCEPTION, 0, 0);
|
|
}
|
|
}
|
|
EIP = new_EIP;
|
|
BX_INSTR_CNEAR_BRANCH_TAKEN(new_EIP);
|
|
revalidate_prefetch_q();
|
|
}
|
|
#if BX_INSTRUMENTATION
|
|
else {
|
|
BX_INSTR_CNEAR_BRANCH_NOT_TAKEN();
|
|
}
|
|
#endif
|
|
|
|
if (i->as32L())
|
|
RCX = ECX - 1; // zero extend
|
|
else
|
|
CX--;
|
|
}
|
|
}
|