mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
cc87172c28
Bochs/bochs/cpu/arith32.cc

870 lines
18 KiB
C++
Raw Normal View History

- add RCS Id to header of every file. This makes it easier to know what's going on when someone sends in a modified file.
2001-10-03 17:10:38 +04:00
/////////////////////////////////////////////////////////////////////////
Merged patch-unallowed-lock-cases patch. According to the Intel manuals: The LOCK prefix can be prepended only to the following instructions and only to those forms of the instructions where the destination operand is a memory operand: ADD, ADC, AND, BTC, BTR, BTS, CMPXCHG, CMPXCH8B, DEC, INC, NEG, NOT, OR, SBB, SUB, XOR, XADD, and XCHG. If the LOCK prefix is used with one of these instructions and the source operand is a memory operand, an undefined opcode exception (#UD) will be generated. An undefined opcode exception will also be generated if the LOCK prefix is used with any instruction not in the above list. Checking of the LOCK prefix done in fetchDecode state and not overloads Bochs's execution.
2003-04-05 16:16:53 +04:00
// $Id: arith32.cc,v 1.31 2003-04-05 12:16:48 sshwarts Exp $
- add RCS Id to header of every file. This makes it easier to know what's going on when someone sends in a modified file.
2001-10-03 17:10:38 +04:00
/////////////////////////////////////////////////////////////////////////
//
- update copyright dates to 2001 for all mandrake headers - for bochs files with other header, replaced with current mandrake header
2001-04-10 06:20:02 +04:00
// Copyright (C) 2001 MandrakeSoft S.A.
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
//
// 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
- parts of the SMP merge apparantly broke the debugger and this revision tries to fix it. The shortcuts to register names such as AX and DL are #defines in cpu/cpu.h, and they are defined in terms of BX_CPU_THIS_PTR. When BX_USE_CPU_SMF=1, this works fine. (This is what bochs used for a long time, and nobody used the SMF=0 mode at all.) To make SMP bochs work, I had to get SMF=0 mode working for the CPU so that there could be an array of cpus. When SMF=0 for the CPU, BX_CPU_THIS_PTR is defined to be "this->" which only works within methods of BX_CPU_C. Code outside of BX_CPU_C must reference BX_CPU(num) instead. - to try to enforce the correct use of AL/AX/DL/etc. shortcuts, they are now only #defined when "NEED_CPU_REG_SHORTCUTS" is #defined. This is only done in the cpu/*.cc code.
2001-05-24 22:46:34 +04:00
#define NEED_CPU_REG_SHORTCUTS 1
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
#include "bochs.h"
merge in BRANCH-io-cleanup. To see the commit logs for this use either cvsweb or cvs update -r BRANCH-io-cleanup and then 'cvs log' the various files. In general this provides a generic interface for logging. logfunctions:: is a class that is inherited by some classes, and also . allocated as a standalone global called 'genlog'. All logging uses . one of the ::info(), ::error(), ::ldebug(), ::panic() methods of this . class through 'BX_INFO(), BX_ERROR(), BX_DEBUG(), BX_PANIC()' macros . respectively. . . An example usage: . BX_INFO(("Hello, World!\n")); iofunctions:: is a class that is allocated once by default, and assigned as the iofunction of each logfunctions instance. It is this class that maintains the file descriptor and other output related code, at this point using vfprintf(). At some future point, someone may choose to write a gui 'console' for bochs to which messages would be redirected simply by assigning a different iofunction class to the various logfunctions objects. More cleanup is coming, but this works for now. If you want to see alot of debugging output, in main.cc, change onoff[LOGLEV_DEBUG]=0 to =1. Comments, bugs, flames, to me: todd@fries.net
2001-05-15 18:49:57 +04:00
#define LOG_THIS BX_CPU_THIS_PTR
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
(cpu64) Merged 2 more. For extdb.cc, essentially I just wrapped the contents of both files with an #ifdef. It's a small file, but I don't use it. Someone else should clean it up.
2002-09-15 05:36:13 +04:00
#if BX_SUPPORT_X86_64==0
// Make life easier for merging cpu64 and cpu code.
#define RAX EAX
#define RDX EDX
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::INC_ERX(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
Added new configure option --enable-host-specific-asms, so the user can turn on/off use of native host specific inline asm statements. By default, this option is enabled, so you only need it to disable inline asms in your compile for now. Currently only on x86+GCC environments, will inline asm() statements be used. Eventually, other platforms could specify some asm()s; probably for endian issues such as byte-swapping and unaligned memory accesses. On x86, there are some inline asm()s which do the arithmetic EFLAGS processing so that the lazy flags handling is somewhat bypassed. Eventually, I'll add more, at least for the more common instructions. This adds a little extra performance.
2002-09-23 21:59:18 +04:00
#if (defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
Split out JZ/JNZ instructions from JCC because they were called so frequently. Coded asm() statements for INC/DEC_ERX() instructions. Cleaned up the iCache a litle including a bug fix. The generation ID was decrementing the whole field including some high meta bits. That could roll over after 1 Billion cycles. I know only decrement if the field is valid, to save the write. I implemented inline functions which can serve the value of the arithmetic flags if they are cached, and redirect to the lazy_flags.cc routines if not. Most of this was just prep work for adding more asm() statements for native eflags processing when on x86.
2002-09-22 05:52:21 +04:00
Bit32u flags32;
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
asmInc32(BX_CPU_THIS_PTR gen_reg[i->opcodeReg()].dword.erx, flags32);
setEFlagsOSZAP(flags32);
Split out JZ/JNZ instructions from JCC because they were called so frequently. Coded asm() statements for INC/DEC_ERX() instructions. Cleaned up the iCache a litle including a bug fix. The generation ID was decrementing the whole field including some high meta bits. That could roll over after 1 Billion cycles. I know only decrement if the field is valid, to save the write. I implemented inline functions which can serve the value of the arithmetic flags if they are cached, and redirect to the lazy_flags.cc routines if not. Most of this was just prep work for adding more asm() statements for native eflags processing when on x86.
2002-09-22 05:52:21 +04:00
#else
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Bit32u erx;
Modified the way that the register field (low 3 bits of a few opcodes also extended by the REX.B field on Hammer) is passed to instructions. I rearranged the bxInstruction_c to free up a field to be used to pass this info when mod-rm bytes are not used. This got rid of the ugly ((i->b1 & 7) + i->rex_b) code. Probably shaved just a very little run time off Hammer emulation, and even less on x86-32. The resultant is a little cleaner anyways.
2002-09-21 03:17:51 +04:00
erx = ++ BX_CPU_THIS_PTR gen_reg[i->opcodeReg()].dword.erx;
Split out JZ/JNZ instructions from JCC because they were called so frequently. Coded asm() statements for INC/DEC_ERX() instructions. Cleaned up the iCache a litle including a bug fix. The generation ID was decrementing the whole field including some high meta bits. That could roll over after 1 Billion cycles. I know only decrement if the field is valid, to save the write. I implemented inline functions which can serve the value of the arithmetic flags if they are cached, and redirect to the lazy_flags.cc routines if not. Most of this was just prep work for adding more asm() statements for native eflags processing when on x86.
2002-09-22 05:52:21 +04:00
#endif
(cpu64) Merged 2 more. For extdb.cc, essentially I just wrapped the contents of both files with an #ifdef. It's a small file, but I don't use it. Someone else should clean it up.
2002-09-15 05:36:13 +04:00
#if BX_SUPPORT_X86_64
Modified the way that the register field (low 3 bits of a few opcodes also extended by the REX.B field on Hammer) is passed to instructions. I rearranged the bxInstruction_c to free up a field to be used to pass this info when mod-rm bytes are not used. This got rid of the ugly ((i->b1 & 7) + i->rex_b) code. Probably shaved just a very little run time off Hammer emulation, and even less on x86-32. The resultant is a little cleaner anyways.
2002-09-21 03:17:51 +04:00
BX_CPU_THIS_PTR gen_reg[i->opcodeReg()].dword.hrx = 0;
(cpu64) Merged 2 more. For extdb.cc, essentially I just wrapped the contents of both files with an #ifdef. It's a small file, but I don't use it. Someone else should clean it up.
2002-09-15 05:36:13 +04:00
#endif
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
Added new configure option --enable-host-specific-asms, so the user can turn on/off use of native host specific inline asm statements. By default, this option is enabled, so you only need it to disable inline asms in your compile for now. Currently only on x86+GCC environments, will inline asm() statements be used. Eventually, other platforms could specify some asm()s; probably for endian issues such as byte-swapping and unaligned memory accesses. On x86, there are some inline asm()s which do the arithmetic EFLAGS processing so that the lazy flags handling is somewhat bypassed. Eventually, I'll add more, at least for the more common instructions. This adds a little extra performance.
2002-09-23 21:59:18 +04:00
#if !(defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
SET_FLAGS_OSZAP_32(0, 0, erx, BX_INSTR_INC32);
Split out JZ/JNZ instructions from JCC because they were called so frequently. Coded asm() statements for INC/DEC_ERX() instructions. Cleaned up the iCache a litle including a bug fix. The generation ID was decrementing the whole field including some high meta bits. That could roll over after 1 Billion cycles. I know only decrement if the field is valid, to save the write. I implemented inline functions which can serve the value of the arithmetic flags if they are cached, and redirect to the lazy_flags.cc routines if not. Most of this was just prep work for adding more asm() statements for native eflags processing when on x86.
2002-09-22 05:52:21 +04:00
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::DEC_ERX(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
Added new configure option --enable-host-specific-asms, so the user can turn on/off use of native host specific inline asm statements. By default, this option is enabled, so you only need it to disable inline asms in your compile for now. Currently only on x86+GCC environments, will inline asm() statements be used. Eventually, other platforms could specify some asm()s; probably for endian issues such as byte-swapping and unaligned memory accesses. On x86, there are some inline asm()s which do the arithmetic EFLAGS processing so that the lazy flags handling is somewhat bypassed. Eventually, I'll add more, at least for the more common instructions. This adds a little extra performance.
2002-09-23 21:59:18 +04:00
#if (defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
Split out JZ/JNZ instructions from JCC because they were called so frequently. Coded asm() statements for INC/DEC_ERX() instructions. Cleaned up the iCache a litle including a bug fix. The generation ID was decrementing the whole field including some high meta bits. That could roll over after 1 Billion cycles. I know only decrement if the field is valid, to save the write. I implemented inline functions which can serve the value of the arithmetic flags if they are cached, and redirect to the lazy_flags.cc routines if not. Most of this was just prep work for adding more asm() statements for native eflags processing when on x86.
2002-09-22 05:52:21 +04:00
Bit32u flags32;
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
asmDec32(BX_CPU_THIS_PTR gen_reg[i->opcodeReg()].dword.erx, flags32);
setEFlagsOSZAP(flags32);
Split out JZ/JNZ instructions from JCC because they were called so frequently. Coded asm() statements for INC/DEC_ERX() instructions. Cleaned up the iCache a litle including a bug fix. The generation ID was decrementing the whole field including some high meta bits. That could roll over after 1 Billion cycles. I know only decrement if the field is valid, to save the write. I implemented inline functions which can serve the value of the arithmetic flags if they are cached, and redirect to the lazy_flags.cc routines if not. Most of this was just prep work for adding more asm() statements for native eflags processing when on x86.
2002-09-22 05:52:21 +04:00
#else
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Bit32u erx;
Modified the way that the register field (low 3 bits of a few opcodes also extended by the REX.B field on Hammer) is passed to instructions. I rearranged the bxInstruction_c to free up a field to be used to pass this info when mod-rm bytes are not used. This got rid of the ugly ((i->b1 & 7) + i->rex_b) code. Probably shaved just a very little run time off Hammer emulation, and even less on x86-32. The resultant is a little cleaner anyways.
2002-09-21 03:17:51 +04:00
erx = -- BX_CPU_THIS_PTR gen_reg[i->opcodeReg()].dword.erx;
Split out JZ/JNZ instructions from JCC because they were called so frequently. Coded asm() statements for INC/DEC_ERX() instructions. Cleaned up the iCache a litle including a bug fix. The generation ID was decrementing the whole field including some high meta bits. That could roll over after 1 Billion cycles. I know only decrement if the field is valid, to save the write. I implemented inline functions which can serve the value of the arithmetic flags if they are cached, and redirect to the lazy_flags.cc routines if not. Most of this was just prep work for adding more asm() statements for native eflags processing when on x86.
2002-09-22 05:52:21 +04:00
#endif
(cpu64) Merged 2 more. For extdb.cc, essentially I just wrapped the contents of both files with an #ifdef. It's a small file, but I don't use it. Someone else should clean it up.
2002-09-15 05:36:13 +04:00
#if BX_SUPPORT_X86_64
Modified the way that the register field (low 3 bits of a few opcodes also extended by the REX.B field on Hammer) is passed to instructions. I rearranged the bxInstruction_c to free up a field to be used to pass this info when mod-rm bytes are not used. This got rid of the ugly ((i->b1 & 7) + i->rex_b) code. Probably shaved just a very little run time off Hammer emulation, and even less on x86-32. The resultant is a little cleaner anyways.
2002-09-21 03:17:51 +04:00
BX_CPU_THIS_PTR gen_reg[i->opcodeReg()].dword.hrx = 0;
(cpu64) Merged 2 more. For extdb.cc, essentially I just wrapped the contents of both files with an #ifdef. It's a small file, but I don't use it. Someone else should clean it up.
2002-09-15 05:36:13 +04:00
#endif
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
Added new configure option --enable-host-specific-asms, so the user can turn on/off use of native host specific inline asm statements. By default, this option is enabled, so you only need it to disable inline asms in your compile for now. Currently only on x86+GCC environments, will inline asm() statements be used. Eventually, other platforms could specify some asm()s; probably for endian issues such as byte-swapping and unaligned memory accesses. On x86, there are some inline asm()s which do the arithmetic EFLAGS processing so that the lazy flags handling is somewhat bypassed. Eventually, I'll add more, at least for the more common instructions. This adds a little extra performance.
2002-09-23 21:59:18 +04:00
#if !(defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
SET_FLAGS_OSZAP_32(0, 0, erx, BX_INSTR_DEC32);
Split out JZ/JNZ instructions from JCC because they were called so frequently. Coded asm() statements for INC/DEC_ERX() instructions. Cleaned up the iCache a litle including a bug fix. The generation ID was decrementing the whole field including some high meta bits. That could roll over after 1 Billion cycles. I know only decrement if the field is valid, to save the write. I implemented inline functions which can serve the value of the arithmetic flags if they are cached, and redirect to the lazy_flags.cc routines if not. Most of this was just prep work for adding more asm() statements for native eflags processing when on x86.
2002-09-22 05:52:21 +04:00
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::ADD_EdGd(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op2_32, op1_32, sum_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
op2_32 = BX_READ_32BIT_REG(i->nnn());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (i->modC0()) {
op1_32 = BX_READ_32BIT_REG(i->rm());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
sum_32 = op1_32 + op2_32;
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
BX_WRITE_32BIT_REGZ(i->rm(), sum_32);
}
else {
read_RMW_virtual_dword(i->seg(), RMAddr(i), &op1_32);
sum_32 = op1_32 + op2_32;
This was not a cleanup. Those macros were intentionally there to offer a way to substitute more efficient code to do the RMW cases. At the moment, they just map to the normal functions. Sorry, restored the previous version ...
2002-10-25 22:26:29 +04:00
Write_RMW_virtual_dword(sum_32);
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAPC_32(op1_32, op2_32, sum_32, BX_INSTR_ADD32);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
BX_CPU_C::ADD_GdEEd(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
Bit32u op1_32, op2_32, sum_32;
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
unsigned nnn = i->nnn();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
op1_32 = BX_READ_32BIT_REG(nnn);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
read_virtual_dword(i->seg(), RMAddr(i), &op2_32);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added new configure option --enable-host-specific-asms, so the user can turn on/off use of native host specific inline asm statements. By default, this option is enabled, so you only need it to disable inline asms in your compile for now. Currently only on x86+GCC environments, will inline asm() statements be used. Eventually, other platforms could specify some asm()s; probably for endian issues such as byte-swapping and unaligned memory accesses. On x86, there are some inline asm()s which do the arithmetic EFLAGS processing so that the lazy flags handling is somewhat bypassed. Eventually, I'll add more, at least for the more common instructions. This adds a little extra performance.
2002-09-23 21:59:18 +04:00
#if (defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
Bit32u flags32;
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
asmAdd32(sum_32, op1_32, op2_32, flags32);
setEFlagsOSZAPC(flags32);
Split out JZ/JNZ instructions from JCC because they were called so frequently. Coded asm() statements for INC/DEC_ERX() instructions. Cleaned up the iCache a litle including a bug fix. The generation ID was decrementing the whole field including some high meta bits. That could roll over after 1 Billion cycles. I know only decrement if the field is valid, to save the write. I implemented inline functions which can serve the value of the arithmetic flags if they are cached, and redirect to the lazy_flags.cc routines if not. Most of this was just prep work for adding more asm() statements for native eflags processing when on x86.
2002-09-22 05:52:21 +04:00
#else
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
sum_32 = op1_32 + op2_32;
Split out JZ/JNZ instructions from JCC because they were called so frequently. Coded asm() statements for INC/DEC_ERX() instructions. Cleaned up the iCache a litle including a bug fix. The generation ID was decrementing the whole field including some high meta bits. That could roll over after 1 Billion cycles. I know only decrement if the field is valid, to save the write. I implemented inline functions which can serve the value of the arithmetic flags if they are cached, and redirect to the lazy_flags.cc routines if not. Most of this was just prep work for adding more asm() statements for native eflags processing when on x86.
2002-09-22 05:52:21 +04:00
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
BX_WRITE_32BIT_REGZ(nnn, sum_32);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added new configure option --enable-host-specific-asms, so the user can turn on/off use of native host specific inline asm statements. By default, this option is enabled, so you only need it to disable inline asms in your compile for now. Currently only on x86+GCC environments, will inline asm() statements be used. Eventually, other platforms could specify some asm()s; probably for endian issues such as byte-swapping and unaligned memory accesses. On x86, there are some inline asm()s which do the arithmetic EFLAGS processing so that the lazy flags handling is somewhat bypassed. Eventually, I'll add more, at least for the more common instructions. This adds a little extra performance.
2002-09-23 21:59:18 +04:00
#if !(defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
SET_FLAGS_OSZAPC_32(op1_32, op2_32, sum_32, BX_INSTR_ADD32);
#endif
}
void
BX_CPU_C::ADD_GdEGd(bxInstruction_c *i)
{
Bit32u op1_32, op2_32, sum_32;
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
unsigned nnn = i->nnn();
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
op1_32 = BX_READ_32BIT_REG(nnn);
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
op2_32 = BX_READ_32BIT_REG(i->rm());
#if (defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
Bit32u flags32;
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
asmAdd32(sum_32, op1_32, op2_32, flags32);
setEFlagsOSZAPC(flags32);
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
#else
sum_32 = op1_32 + op2_32;
#endif
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
BX_WRITE_32BIT_REGZ(nnn, sum_32);
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
#if !(defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
SET_FLAGS_OSZAPC_32(op1_32, op2_32, sum_32, BX_INSTR_ADD32);
Split out JZ/JNZ instructions from JCC because they were called so frequently. Coded asm() statements for INC/DEC_ERX() instructions. Cleaned up the iCache a litle including a bug fix. The generation ID was decrementing the whole field including some high meta bits. That could roll over after 1 Billion cycles. I know only decrement if the field is valid, to save the write. I implemented inline functions which can serve the value of the arithmetic flags if they are cached, and redirect to the lazy_flags.cc routines if not. Most of this was just prep work for adding more asm() statements for native eflags processing when on x86.
2002-09-22 05:52:21 +04:00
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::ADD_EAXId(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op1_32, op2_32, sum_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
op1_32 = EAX;
op2_32 = i->Id();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
sum_32 = op1_32 + op2_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
RAX = sum_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAPC_32(op1_32, op2_32, sum_32, BX_INSTR_ADD32);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::ADC_EdGd(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
- Apply patch.replace-Boolean rev 1.3. Every "Boolean" is now changed to a "bx_bool" which is always defined as Bit32u on all platforms. In Carbon specific code, Boolean is still used because the Carbon header files define it to unsigned char. - this fixes bug [ 623152 ] MacOSX: Triple Exception Booting win95. The bug was that some code in Bochs depends on Boolean to be a 32 bit value. (This should be fixed, but I don't know all the places where it needs to be fixed yet.) Because Carbon defined Boolean as an unsigned char, Bochs just followed along and used the unsigned char definition to avoid compile problems. This exposed the dependency on 32 bit Boolean on MacOS X only and led to major simulation problems, that could only be reproduced and debugged on that platform. - On the mailing list we debated whether to make all Booleans into "bool" or our own type. I chose bx_bool for several reasons. 1. Unlike C++'s bool, we can guarantee that bx_bool is the same size on all platforms, which makes it much less likely to have more platform-specific simulation differences in the future. (I spent hours on a borrowed MacOSX machine chasing bug 618388 before discovering that different sized Booleans were the problem, and I don't want to repeat that.) 2. We still have at least one dependency on 32 bit Booleans which must be fixed some time, but I don't want to risk introducing new bugs into the simulation just before the 2.0 release. Modified Files: bochs.h config.h.in gdbstub.cc logio.cc main.cc pc_system.cc pc_system.h plugin.cc plugin.h bios/rombios.c cpu/apic.cc cpu/arith16.cc cpu/arith32.cc cpu/arith64.cc cpu/arith8.cc cpu/cpu.cc cpu/cpu.h cpu/ctrl_xfer16.cc cpu/ctrl_xfer32.cc cpu/ctrl_xfer64.cc cpu/data_xfer16.cc cpu/data_xfer32.cc cpu/data_xfer64.cc cpu/debugstuff.cc cpu/exception.cc cpu/fetchdecode.cc cpu/flag_ctrl_pro.cc cpu/init.cc cpu/io_pro.cc cpu/lazy_flags.cc cpu/lazy_flags.h cpu/mult16.cc cpu/mult32.cc cpu/mult64.cc cpu/mult8.cc cpu/paging.cc cpu/proc_ctrl.cc cpu/segment_ctrl_pro.cc cpu/stack_pro.cc cpu/tasking.cc debug/dbg_main.cc debug/debug.h debug/sim2.cc disasm/dis_decode.cc disasm/disasm.h doc/docbook/Makefile docs-html/cosimulation.html fpu/wmFPUemu_glue.cc gui/amigaos.cc gui/beos.cc gui/carbon.cc gui/gui.cc gui/gui.h gui/keymap.cc gui/keymap.h gui/macintosh.cc gui/nogui.cc gui/rfb.cc gui/sdl.cc gui/siminterface.cc gui/siminterface.h gui/term.cc gui/win32.cc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/x.cc instrument/example0/instrument.cc instrument/example0/instrument.h instrument/example1/instrument.cc instrument/example1/instrument.h instrument/stubs/instrument.cc instrument/stubs/instrument.h iodev/cdrom.cc iodev/cdrom.h iodev/cdrom_osx.cc iodev/cmos.cc iodev/devices.cc iodev/dma.cc iodev/dma.h iodev/eth_arpback.cc iodev/eth_packetmaker.cc iodev/eth_packetmaker.h iodev/floppy.cc iodev/floppy.h iodev/guest2host.h iodev/harddrv.cc iodev/harddrv.h iodev/ioapic.cc iodev/ioapic.h iodev/iodebug.cc iodev/iodev.h iodev/keyboard.cc iodev/keyboard.h iodev/ne2k.h iodev/parallel.h iodev/pci.cc iodev/pci.h iodev/pic.h iodev/pit.cc iodev/pit.h iodev/pit_wrap.cc iodev/pit_wrap.h iodev/sb16.cc iodev/sb16.h iodev/serial.cc iodev/serial.h iodev/vga.cc iodev/vga.h memory/memory.h memory/misc_mem.cc
2002-10-25 15:44:41 +04:00
bx_bool temp_CF;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
I updated code that was using !!get_CF() (or other arithmetic flag) to use getB_CF() etc. getB_CF() and friends are only for a relatively small number of cases where a true boolean/binary number (0 or 1) is required rather than 0 or non-0 as is returned by get_CF().
2002-09-24 22:33:38 +04:00
temp_CF = getB_CF();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op2_32, op1_32, sum_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
op2_32 = BX_READ_32BIT_REG(i->nnn());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (i->modC0()) {
op1_32 = BX_READ_32BIT_REG(i->rm());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
sum_32 = op1_32 + op2_32 + temp_CF;
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
BX_WRITE_32BIT_REGZ(i->rm(), sum_32);
}
else {
read_RMW_virtual_dword(i->seg(), RMAddr(i), &op1_32);
sum_32 = op1_32 + op2_32 + temp_CF;
This was not a cleanup. Those macros were intentionally there to offer a way to substitute more efficient code to do the RMW cases. At the moment, they just map to the normal functions. Sorry, restored the previous version ...
2002-10-25 22:26:29 +04:00
Write_RMW_virtual_dword(sum_32);
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAPC_32_CF(op1_32, op2_32, sum_32, BX_INSTR_ADC32,
temp_CF);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::ADC_GdEd(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
- Apply patch.replace-Boolean rev 1.3. Every "Boolean" is now changed to a "bx_bool" which is always defined as Bit32u on all platforms. In Carbon specific code, Boolean is still used because the Carbon header files define it to unsigned char. - this fixes bug [ 623152 ] MacOSX: Triple Exception Booting win95. The bug was that some code in Bochs depends on Boolean to be a 32 bit value. (This should be fixed, but I don't know all the places where it needs to be fixed yet.) Because Carbon defined Boolean as an unsigned char, Bochs just followed along and used the unsigned char definition to avoid compile problems. This exposed the dependency on 32 bit Boolean on MacOS X only and led to major simulation problems, that could only be reproduced and debugged on that platform. - On the mailing list we debated whether to make all Booleans into "bool" or our own type. I chose bx_bool for several reasons. 1. Unlike C++'s bool, we can guarantee that bx_bool is the same size on all platforms, which makes it much less likely to have more platform-specific simulation differences in the future. (I spent hours on a borrowed MacOSX machine chasing bug 618388 before discovering that different sized Booleans were the problem, and I don't want to repeat that.) 2. We still have at least one dependency on 32 bit Booleans which must be fixed some time, but I don't want to risk introducing new bugs into the simulation just before the 2.0 release. Modified Files: bochs.h config.h.in gdbstub.cc logio.cc main.cc pc_system.cc pc_system.h plugin.cc plugin.h bios/rombios.c cpu/apic.cc cpu/arith16.cc cpu/arith32.cc cpu/arith64.cc cpu/arith8.cc cpu/cpu.cc cpu/cpu.h cpu/ctrl_xfer16.cc cpu/ctrl_xfer32.cc cpu/ctrl_xfer64.cc cpu/data_xfer16.cc cpu/data_xfer32.cc cpu/data_xfer64.cc cpu/debugstuff.cc cpu/exception.cc cpu/fetchdecode.cc cpu/flag_ctrl_pro.cc cpu/init.cc cpu/io_pro.cc cpu/lazy_flags.cc cpu/lazy_flags.h cpu/mult16.cc cpu/mult32.cc cpu/mult64.cc cpu/mult8.cc cpu/paging.cc cpu/proc_ctrl.cc cpu/segment_ctrl_pro.cc cpu/stack_pro.cc cpu/tasking.cc debug/dbg_main.cc debug/debug.h debug/sim2.cc disasm/dis_decode.cc disasm/disasm.h doc/docbook/Makefile docs-html/cosimulation.html fpu/wmFPUemu_glue.cc gui/amigaos.cc gui/beos.cc gui/carbon.cc gui/gui.cc gui/gui.h gui/keymap.cc gui/keymap.h gui/macintosh.cc gui/nogui.cc gui/rfb.cc gui/sdl.cc gui/siminterface.cc gui/siminterface.h gui/term.cc gui/win32.cc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/x.cc instrument/example0/instrument.cc instrument/example0/instrument.h instrument/example1/instrument.cc instrument/example1/instrument.h instrument/stubs/instrument.cc instrument/stubs/instrument.h iodev/cdrom.cc iodev/cdrom.h iodev/cdrom_osx.cc iodev/cmos.cc iodev/devices.cc iodev/dma.cc iodev/dma.h iodev/eth_arpback.cc iodev/eth_packetmaker.cc iodev/eth_packetmaker.h iodev/floppy.cc iodev/floppy.h iodev/guest2host.h iodev/harddrv.cc iodev/harddrv.h iodev/ioapic.cc iodev/ioapic.h iodev/iodebug.cc iodev/iodev.h iodev/keyboard.cc iodev/keyboard.h iodev/ne2k.h iodev/parallel.h iodev/pci.cc iodev/pci.h iodev/pic.h iodev/pit.cc iodev/pit.h iodev/pit_wrap.cc iodev/pit_wrap.h iodev/sb16.cc iodev/sb16.h iodev/serial.cc iodev/serial.h iodev/vga.cc iodev/vga.h memory/memory.h memory/misc_mem.cc
2002-10-25 15:44:41 +04:00
bx_bool temp_CF;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
I updated code that was using !!get_CF() (or other arithmetic flag) to use getB_CF() etc. getB_CF() and friends are only for a relatively small number of cases where a true boolean/binary number (0 or 1) is required rather than 0 or non-0 as is returned by get_CF().
2002-09-24 22:33:38 +04:00
temp_CF = getB_CF();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op1_32, op2_32, sum_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
op1_32 = BX_READ_32BIT_REG(i->nnn());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (i->modC0()) {
op2_32 = BX_READ_32BIT_REG(i->rm());
}
else {
read_virtual_dword(i->seg(), RMAddr(i), &op2_32);
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
sum_32 = op1_32 + op2_32 + temp_CF;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
BX_WRITE_32BIT_REGZ(i->nnn(), sum_32);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAPC_32_CF(op1_32, op2_32, sum_32, BX_INSTR_ADC32,
temp_CF);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::ADC_EAXId(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
- Apply patch.replace-Boolean rev 1.3. Every "Boolean" is now changed to a "bx_bool" which is always defined as Bit32u on all platforms. In Carbon specific code, Boolean is still used because the Carbon header files define it to unsigned char. - this fixes bug [ 623152 ] MacOSX: Triple Exception Booting win95. The bug was that some code in Bochs depends on Boolean to be a 32 bit value. (This should be fixed, but I don't know all the places where it needs to be fixed yet.) Because Carbon defined Boolean as an unsigned char, Bochs just followed along and used the unsigned char definition to avoid compile problems. This exposed the dependency on 32 bit Boolean on MacOS X only and led to major simulation problems, that could only be reproduced and debugged on that platform. - On the mailing list we debated whether to make all Booleans into "bool" or our own type. I chose bx_bool for several reasons. 1. Unlike C++'s bool, we can guarantee that bx_bool is the same size on all platforms, which makes it much less likely to have more platform-specific simulation differences in the future. (I spent hours on a borrowed MacOSX machine chasing bug 618388 before discovering that different sized Booleans were the problem, and I don't want to repeat that.) 2. We still have at least one dependency on 32 bit Booleans which must be fixed some time, but I don't want to risk introducing new bugs into the simulation just before the 2.0 release. Modified Files: bochs.h config.h.in gdbstub.cc logio.cc main.cc pc_system.cc pc_system.h plugin.cc plugin.h bios/rombios.c cpu/apic.cc cpu/arith16.cc cpu/arith32.cc cpu/arith64.cc cpu/arith8.cc cpu/cpu.cc cpu/cpu.h cpu/ctrl_xfer16.cc cpu/ctrl_xfer32.cc cpu/ctrl_xfer64.cc cpu/data_xfer16.cc cpu/data_xfer32.cc cpu/data_xfer64.cc cpu/debugstuff.cc cpu/exception.cc cpu/fetchdecode.cc cpu/flag_ctrl_pro.cc cpu/init.cc cpu/io_pro.cc cpu/lazy_flags.cc cpu/lazy_flags.h cpu/mult16.cc cpu/mult32.cc cpu/mult64.cc cpu/mult8.cc cpu/paging.cc cpu/proc_ctrl.cc cpu/segment_ctrl_pro.cc cpu/stack_pro.cc cpu/tasking.cc debug/dbg_main.cc debug/debug.h debug/sim2.cc disasm/dis_decode.cc disasm/disasm.h doc/docbook/Makefile docs-html/cosimulation.html fpu/wmFPUemu_glue.cc gui/amigaos.cc gui/beos.cc gui/carbon.cc gui/gui.cc gui/gui.h gui/keymap.cc gui/keymap.h gui/macintosh.cc gui/nogui.cc gui/rfb.cc gui/sdl.cc gui/siminterface.cc gui/siminterface.h gui/term.cc gui/win32.cc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/x.cc instrument/example0/instrument.cc instrument/example0/instrument.h instrument/example1/instrument.cc instrument/example1/instrument.h instrument/stubs/instrument.cc instrument/stubs/instrument.h iodev/cdrom.cc iodev/cdrom.h iodev/cdrom_osx.cc iodev/cmos.cc iodev/devices.cc iodev/dma.cc iodev/dma.h iodev/eth_arpback.cc iodev/eth_packetmaker.cc iodev/eth_packetmaker.h iodev/floppy.cc iodev/floppy.h iodev/guest2host.h iodev/harddrv.cc iodev/harddrv.h iodev/ioapic.cc iodev/ioapic.h iodev/iodebug.cc iodev/iodev.h iodev/keyboard.cc iodev/keyboard.h iodev/ne2k.h iodev/parallel.h iodev/pci.cc iodev/pci.h iodev/pic.h iodev/pit.cc iodev/pit.h iodev/pit_wrap.cc iodev/pit_wrap.h iodev/sb16.cc iodev/sb16.h iodev/serial.cc iodev/serial.h iodev/vga.cc iodev/vga.h memory/memory.h memory/misc_mem.cc
2002-10-25 15:44:41 +04:00
bx_bool temp_CF;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
I updated code that was using !!get_CF() (or other arithmetic flag) to use getB_CF() etc. getB_CF() and friends are only for a relatively small number of cases where a true boolean/binary number (0 or 1) is required rather than 0 or non-0 as is returned by get_CF().
2002-09-24 22:33:38 +04:00
temp_CF = getB_CF();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op1_32, op2_32, sum_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
op1_32 = EAX;
op2_32 = i->Id();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
sum_32 = op1_32 + op2_32 + temp_CF;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
RAX = sum_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAPC_32_CF(op1_32, op2_32, sum_32, BX_INSTR_ADC32,
temp_CF);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::SBB_EdGd(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
- Apply patch.replace-Boolean rev 1.3. Every "Boolean" is now changed to a "bx_bool" which is always defined as Bit32u on all platforms. In Carbon specific code, Boolean is still used because the Carbon header files define it to unsigned char. - this fixes bug [ 623152 ] MacOSX: Triple Exception Booting win95. The bug was that some code in Bochs depends on Boolean to be a 32 bit value. (This should be fixed, but I don't know all the places where it needs to be fixed yet.) Because Carbon defined Boolean as an unsigned char, Bochs just followed along and used the unsigned char definition to avoid compile problems. This exposed the dependency on 32 bit Boolean on MacOS X only and led to major simulation problems, that could only be reproduced and debugged on that platform. - On the mailing list we debated whether to make all Booleans into "bool" or our own type. I chose bx_bool for several reasons. 1. Unlike C++'s bool, we can guarantee that bx_bool is the same size on all platforms, which makes it much less likely to have more platform-specific simulation differences in the future. (I spent hours on a borrowed MacOSX machine chasing bug 618388 before discovering that different sized Booleans were the problem, and I don't want to repeat that.) 2. We still have at least one dependency on 32 bit Booleans which must be fixed some time, but I don't want to risk introducing new bugs into the simulation just before the 2.0 release. Modified Files: bochs.h config.h.in gdbstub.cc logio.cc main.cc pc_system.cc pc_system.h plugin.cc plugin.h bios/rombios.c cpu/apic.cc cpu/arith16.cc cpu/arith32.cc cpu/arith64.cc cpu/arith8.cc cpu/cpu.cc cpu/cpu.h cpu/ctrl_xfer16.cc cpu/ctrl_xfer32.cc cpu/ctrl_xfer64.cc cpu/data_xfer16.cc cpu/data_xfer32.cc cpu/data_xfer64.cc cpu/debugstuff.cc cpu/exception.cc cpu/fetchdecode.cc cpu/flag_ctrl_pro.cc cpu/init.cc cpu/io_pro.cc cpu/lazy_flags.cc cpu/lazy_flags.h cpu/mult16.cc cpu/mult32.cc cpu/mult64.cc cpu/mult8.cc cpu/paging.cc cpu/proc_ctrl.cc cpu/segment_ctrl_pro.cc cpu/stack_pro.cc cpu/tasking.cc debug/dbg_main.cc debug/debug.h debug/sim2.cc disasm/dis_decode.cc disasm/disasm.h doc/docbook/Makefile docs-html/cosimulation.html fpu/wmFPUemu_glue.cc gui/amigaos.cc gui/beos.cc gui/carbon.cc gui/gui.cc gui/gui.h gui/keymap.cc gui/keymap.h gui/macintosh.cc gui/nogui.cc gui/rfb.cc gui/sdl.cc gui/siminterface.cc gui/siminterface.h gui/term.cc gui/win32.cc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/x.cc instrument/example0/instrument.cc instrument/example0/instrument.h instrument/example1/instrument.cc instrument/example1/instrument.h instrument/stubs/instrument.cc instrument/stubs/instrument.h iodev/cdrom.cc iodev/cdrom.h iodev/cdrom_osx.cc iodev/cmos.cc iodev/devices.cc iodev/dma.cc iodev/dma.h iodev/eth_arpback.cc iodev/eth_packetmaker.cc iodev/eth_packetmaker.h iodev/floppy.cc iodev/floppy.h iodev/guest2host.h iodev/harddrv.cc iodev/harddrv.h iodev/ioapic.cc iodev/ioapic.h iodev/iodebug.cc iodev/iodev.h iodev/keyboard.cc iodev/keyboard.h iodev/ne2k.h iodev/parallel.h iodev/pci.cc iodev/pci.h iodev/pic.h iodev/pit.cc iodev/pit.h iodev/pit_wrap.cc iodev/pit_wrap.h iodev/sb16.cc iodev/sb16.h iodev/serial.cc iodev/serial.h iodev/vga.cc iodev/vga.h memory/memory.h memory/misc_mem.cc
2002-10-25 15:44:41 +04:00
bx_bool temp_CF;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
I updated code that was using !!get_CF() (or other arithmetic flag) to use getB_CF() etc. getB_CF() and friends are only for a relatively small number of cases where a true boolean/binary number (0 or 1) is required rather than 0 or non-0 as is returned by get_CF().
2002-09-24 22:33:38 +04:00
temp_CF = getB_CF();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op2_32, op1_32, diff_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
op2_32 = BX_READ_32BIT_REG(i->nnn());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (i->modC0()) {
op1_32 = BX_READ_32BIT_REG(i->rm());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
diff_32 = op1_32 - (op2_32 + temp_CF);
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
BX_WRITE_32BIT_REGZ(i->rm(), diff_32);
}
else {
read_RMW_virtual_dword(i->seg(), RMAddr(i), &op1_32);
diff_32 = op1_32 - (op2_32 + temp_CF);
This was not a cleanup. Those macros were intentionally there to offer a way to substitute more efficient code to do the RMW cases. At the moment, they just map to the normal functions. Sorry, restored the previous version ...
2002-10-25 22:26:29 +04:00
Write_RMW_virtual_dword(diff_32);
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAPC_32_CF(op1_32, op2_32, diff_32, BX_INSTR_SBB32,
temp_CF);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::SBB_GdEd(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
- Apply patch.replace-Boolean rev 1.3. Every "Boolean" is now changed to a "bx_bool" which is always defined as Bit32u on all platforms. In Carbon specific code, Boolean is still used because the Carbon header files define it to unsigned char. - this fixes bug [ 623152 ] MacOSX: Triple Exception Booting win95. The bug was that some code in Bochs depends on Boolean to be a 32 bit value. (This should be fixed, but I don't know all the places where it needs to be fixed yet.) Because Carbon defined Boolean as an unsigned char, Bochs just followed along and used the unsigned char definition to avoid compile problems. This exposed the dependency on 32 bit Boolean on MacOS X only and led to major simulation problems, that could only be reproduced and debugged on that platform. - On the mailing list we debated whether to make all Booleans into "bool" or our own type. I chose bx_bool for several reasons. 1. Unlike C++'s bool, we can guarantee that bx_bool is the same size on all platforms, which makes it much less likely to have more platform-specific simulation differences in the future. (I spent hours on a borrowed MacOSX machine chasing bug 618388 before discovering that different sized Booleans were the problem, and I don't want to repeat that.) 2. We still have at least one dependency on 32 bit Booleans which must be fixed some time, but I don't want to risk introducing new bugs into the simulation just before the 2.0 release. Modified Files: bochs.h config.h.in gdbstub.cc logio.cc main.cc pc_system.cc pc_system.h plugin.cc plugin.h bios/rombios.c cpu/apic.cc cpu/arith16.cc cpu/arith32.cc cpu/arith64.cc cpu/arith8.cc cpu/cpu.cc cpu/cpu.h cpu/ctrl_xfer16.cc cpu/ctrl_xfer32.cc cpu/ctrl_xfer64.cc cpu/data_xfer16.cc cpu/data_xfer32.cc cpu/data_xfer64.cc cpu/debugstuff.cc cpu/exception.cc cpu/fetchdecode.cc cpu/flag_ctrl_pro.cc cpu/init.cc cpu/io_pro.cc cpu/lazy_flags.cc cpu/lazy_flags.h cpu/mult16.cc cpu/mult32.cc cpu/mult64.cc cpu/mult8.cc cpu/paging.cc cpu/proc_ctrl.cc cpu/segment_ctrl_pro.cc cpu/stack_pro.cc cpu/tasking.cc debug/dbg_main.cc debug/debug.h debug/sim2.cc disasm/dis_decode.cc disasm/disasm.h doc/docbook/Makefile docs-html/cosimulation.html fpu/wmFPUemu_glue.cc gui/amigaos.cc gui/beos.cc gui/carbon.cc gui/gui.cc gui/gui.h gui/keymap.cc gui/keymap.h gui/macintosh.cc gui/nogui.cc gui/rfb.cc gui/sdl.cc gui/siminterface.cc gui/siminterface.h gui/term.cc gui/win32.cc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/x.cc instrument/example0/instrument.cc instrument/example0/instrument.h instrument/example1/instrument.cc instrument/example1/instrument.h instrument/stubs/instrument.cc instrument/stubs/instrument.h iodev/cdrom.cc iodev/cdrom.h iodev/cdrom_osx.cc iodev/cmos.cc iodev/devices.cc iodev/dma.cc iodev/dma.h iodev/eth_arpback.cc iodev/eth_packetmaker.cc iodev/eth_packetmaker.h iodev/floppy.cc iodev/floppy.h iodev/guest2host.h iodev/harddrv.cc iodev/harddrv.h iodev/ioapic.cc iodev/ioapic.h iodev/iodebug.cc iodev/iodev.h iodev/keyboard.cc iodev/keyboard.h iodev/ne2k.h iodev/parallel.h iodev/pci.cc iodev/pci.h iodev/pic.h iodev/pit.cc iodev/pit.h iodev/pit_wrap.cc iodev/pit_wrap.h iodev/sb16.cc iodev/sb16.h iodev/serial.cc iodev/serial.h iodev/vga.cc iodev/vga.h memory/memory.h memory/misc_mem.cc
2002-10-25 15:44:41 +04:00
bx_bool temp_CF;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
I updated code that was using !!get_CF() (or other arithmetic flag) to use getB_CF() etc. getB_CF() and friends are only for a relatively small number of cases where a true boolean/binary number (0 or 1) is required rather than 0 or non-0 as is returned by get_CF().
2002-09-24 22:33:38 +04:00
temp_CF = getB_CF();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op1_32, op2_32, diff_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
op1_32 = BX_READ_32BIT_REG(i->nnn());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (i->modC0()) {
op2_32 = BX_READ_32BIT_REG(i->rm());
}
else {
read_virtual_dword(i->seg(), RMAddr(i), &op2_32);
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
diff_32 = op1_32 - (op2_32 + temp_CF);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
BX_WRITE_32BIT_REGZ(i->nnn(), diff_32);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAPC_32_CF(op1_32, op2_32, diff_32, BX_INSTR_SBB32,
temp_CF);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::SBB_EAXId(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
- Apply patch.replace-Boolean rev 1.3. Every "Boolean" is now changed to a "bx_bool" which is always defined as Bit32u on all platforms. In Carbon specific code, Boolean is still used because the Carbon header files define it to unsigned char. - this fixes bug [ 623152 ] MacOSX: Triple Exception Booting win95. The bug was that some code in Bochs depends on Boolean to be a 32 bit value. (This should be fixed, but I don't know all the places where it needs to be fixed yet.) Because Carbon defined Boolean as an unsigned char, Bochs just followed along and used the unsigned char definition to avoid compile problems. This exposed the dependency on 32 bit Boolean on MacOS X only and led to major simulation problems, that could only be reproduced and debugged on that platform. - On the mailing list we debated whether to make all Booleans into "bool" or our own type. I chose bx_bool for several reasons. 1. Unlike C++'s bool, we can guarantee that bx_bool is the same size on all platforms, which makes it much less likely to have more platform-specific simulation differences in the future. (I spent hours on a borrowed MacOSX machine chasing bug 618388 before discovering that different sized Booleans were the problem, and I don't want to repeat that.) 2. We still have at least one dependency on 32 bit Booleans which must be fixed some time, but I don't want to risk introducing new bugs into the simulation just before the 2.0 release. Modified Files: bochs.h config.h.in gdbstub.cc logio.cc main.cc pc_system.cc pc_system.h plugin.cc plugin.h bios/rombios.c cpu/apic.cc cpu/arith16.cc cpu/arith32.cc cpu/arith64.cc cpu/arith8.cc cpu/cpu.cc cpu/cpu.h cpu/ctrl_xfer16.cc cpu/ctrl_xfer32.cc cpu/ctrl_xfer64.cc cpu/data_xfer16.cc cpu/data_xfer32.cc cpu/data_xfer64.cc cpu/debugstuff.cc cpu/exception.cc cpu/fetchdecode.cc cpu/flag_ctrl_pro.cc cpu/init.cc cpu/io_pro.cc cpu/lazy_flags.cc cpu/lazy_flags.h cpu/mult16.cc cpu/mult32.cc cpu/mult64.cc cpu/mult8.cc cpu/paging.cc cpu/proc_ctrl.cc cpu/segment_ctrl_pro.cc cpu/stack_pro.cc cpu/tasking.cc debug/dbg_main.cc debug/debug.h debug/sim2.cc disasm/dis_decode.cc disasm/disasm.h doc/docbook/Makefile docs-html/cosimulation.html fpu/wmFPUemu_glue.cc gui/amigaos.cc gui/beos.cc gui/carbon.cc gui/gui.cc gui/gui.h gui/keymap.cc gui/keymap.h gui/macintosh.cc gui/nogui.cc gui/rfb.cc gui/sdl.cc gui/siminterface.cc gui/siminterface.h gui/term.cc gui/win32.cc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/x.cc instrument/example0/instrument.cc instrument/example0/instrument.h instrument/example1/instrument.cc instrument/example1/instrument.h instrument/stubs/instrument.cc instrument/stubs/instrument.h iodev/cdrom.cc iodev/cdrom.h iodev/cdrom_osx.cc iodev/cmos.cc iodev/devices.cc iodev/dma.cc iodev/dma.h iodev/eth_arpback.cc iodev/eth_packetmaker.cc iodev/eth_packetmaker.h iodev/floppy.cc iodev/floppy.h iodev/guest2host.h iodev/harddrv.cc iodev/harddrv.h iodev/ioapic.cc iodev/ioapic.h iodev/iodebug.cc iodev/iodev.h iodev/keyboard.cc iodev/keyboard.h iodev/ne2k.h iodev/parallel.h iodev/pci.cc iodev/pci.h iodev/pic.h iodev/pit.cc iodev/pit.h iodev/pit_wrap.cc iodev/pit_wrap.h iodev/sb16.cc iodev/sb16.h iodev/serial.cc iodev/serial.h iodev/vga.cc iodev/vga.h memory/memory.h memory/misc_mem.cc
2002-10-25 15:44:41 +04:00
bx_bool temp_CF;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
I updated code that was using !!get_CF() (or other arithmetic flag) to use getB_CF() etc. getB_CF() and friends are only for a relatively small number of cases where a true boolean/binary number (0 or 1) is required rather than 0 or non-0 as is returned by get_CF().
2002-09-24 22:33:38 +04:00
temp_CF = getB_CF();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op1_32, op2_32, diff_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
op1_32 = EAX;
op2_32 = i->Id();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
diff_32 = op1_32 - (op2_32 + temp_CF);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
RAX = diff_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAPC_32_CF(op1_32, op2_32, diff_32, BX_INSTR_SBB32,
temp_CF);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::SBB_EdId(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
- Apply patch.replace-Boolean rev 1.3. Every "Boolean" is now changed to a "bx_bool" which is always defined as Bit32u on all platforms. In Carbon specific code, Boolean is still used because the Carbon header files define it to unsigned char. - this fixes bug [ 623152 ] MacOSX: Triple Exception Booting win95. The bug was that some code in Bochs depends on Boolean to be a 32 bit value. (This should be fixed, but I don't know all the places where it needs to be fixed yet.) Because Carbon defined Boolean as an unsigned char, Bochs just followed along and used the unsigned char definition to avoid compile problems. This exposed the dependency on 32 bit Boolean on MacOS X only and led to major simulation problems, that could only be reproduced and debugged on that platform. - On the mailing list we debated whether to make all Booleans into "bool" or our own type. I chose bx_bool for several reasons. 1. Unlike C++'s bool, we can guarantee that bx_bool is the same size on all platforms, which makes it much less likely to have more platform-specific simulation differences in the future. (I spent hours on a borrowed MacOSX machine chasing bug 618388 before discovering that different sized Booleans were the problem, and I don't want to repeat that.) 2. We still have at least one dependency on 32 bit Booleans which must be fixed some time, but I don't want to risk introducing new bugs into the simulation just before the 2.0 release. Modified Files: bochs.h config.h.in gdbstub.cc logio.cc main.cc pc_system.cc pc_system.h plugin.cc plugin.h bios/rombios.c cpu/apic.cc cpu/arith16.cc cpu/arith32.cc cpu/arith64.cc cpu/arith8.cc cpu/cpu.cc cpu/cpu.h cpu/ctrl_xfer16.cc cpu/ctrl_xfer32.cc cpu/ctrl_xfer64.cc cpu/data_xfer16.cc cpu/data_xfer32.cc cpu/data_xfer64.cc cpu/debugstuff.cc cpu/exception.cc cpu/fetchdecode.cc cpu/flag_ctrl_pro.cc cpu/init.cc cpu/io_pro.cc cpu/lazy_flags.cc cpu/lazy_flags.h cpu/mult16.cc cpu/mult32.cc cpu/mult64.cc cpu/mult8.cc cpu/paging.cc cpu/proc_ctrl.cc cpu/segment_ctrl_pro.cc cpu/stack_pro.cc cpu/tasking.cc debug/dbg_main.cc debug/debug.h debug/sim2.cc disasm/dis_decode.cc disasm/disasm.h doc/docbook/Makefile docs-html/cosimulation.html fpu/wmFPUemu_glue.cc gui/amigaos.cc gui/beos.cc gui/carbon.cc gui/gui.cc gui/gui.h gui/keymap.cc gui/keymap.h gui/macintosh.cc gui/nogui.cc gui/rfb.cc gui/sdl.cc gui/siminterface.cc gui/siminterface.h gui/term.cc gui/win32.cc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/x.cc instrument/example0/instrument.cc instrument/example0/instrument.h instrument/example1/instrument.cc instrument/example1/instrument.h instrument/stubs/instrument.cc instrument/stubs/instrument.h iodev/cdrom.cc iodev/cdrom.h iodev/cdrom_osx.cc iodev/cmos.cc iodev/devices.cc iodev/dma.cc iodev/dma.h iodev/eth_arpback.cc iodev/eth_packetmaker.cc iodev/eth_packetmaker.h iodev/floppy.cc iodev/floppy.h iodev/guest2host.h iodev/harddrv.cc iodev/harddrv.h iodev/ioapic.cc iodev/ioapic.h iodev/iodebug.cc iodev/iodev.h iodev/keyboard.cc iodev/keyboard.h iodev/ne2k.h iodev/parallel.h iodev/pci.cc iodev/pci.h iodev/pic.h iodev/pit.cc iodev/pit.h iodev/pit_wrap.cc iodev/pit_wrap.h iodev/sb16.cc iodev/sb16.h iodev/serial.cc iodev/serial.h iodev/vga.cc iodev/vga.h memory/memory.h memory/misc_mem.cc
2002-10-25 15:44:41 +04:00
bx_bool temp_CF;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
I updated code that was using !!get_CF() (or other arithmetic flag) to use getB_CF() etc. getB_CF() and friends are only for a relatively small number of cases where a true boolean/binary number (0 or 1) is required rather than 0 or non-0 as is returned by get_CF().
2002-09-24 22:33:38 +04:00
temp_CF = getB_CF();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op2_32, op1_32, diff_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
op2_32 = i->Id();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (i->modC0()) {
op1_32 = BX_READ_32BIT_REG(i->rm());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
diff_32 = op1_32 - (op2_32 + temp_CF);
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
BX_WRITE_32BIT_REGZ(i->rm(), diff_32);
}
else {
read_RMW_virtual_dword(i->seg(), RMAddr(i), &op1_32);
diff_32 = op1_32 - (op2_32 + temp_CF);
This was not a cleanup. Those macros were intentionally there to offer a way to substitute more efficient code to do the RMW cases. At the moment, they just map to the normal functions. Sorry, restored the previous version ...
2002-10-25 22:26:29 +04:00
Write_RMW_virtual_dword(diff_32);
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAPC_32_CF(op1_32, op2_32, diff_32, BX_INSTR_SBB32,
temp_CF);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::SUB_EdGd(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op2_32, op1_32, diff_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
op2_32 = BX_READ_32BIT_REG(i->nnn());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (i->modC0()) {
op1_32 = BX_READ_32BIT_REG(i->rm());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
diff_32 = op1_32 - op2_32;
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
BX_WRITE_32BIT_REGZ(i->rm(), diff_32);
}
else {
read_RMW_virtual_dword(i->seg(), RMAddr(i), &op1_32);
diff_32 = op1_32 - op2_32;
This was not a cleanup. Those macros were intentionally there to offer a way to substitute more efficient code to do the RMW cases. At the moment, they just map to the normal functions. Sorry, restored the previous version ...
2002-10-25 22:26:29 +04:00
Write_RMW_virtual_dword(diff_32);
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAPC_32(op1_32, op2_32, diff_32, BX_INSTR_SUB32);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::SUB_GdEd(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op1_32, op2_32, diff_32;
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
unsigned nnn = i->nnn();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
op1_32 = BX_READ_32BIT_REG(nnn);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (i->modC0()) {
op2_32 = BX_READ_32BIT_REG(i->rm());
}
else {
read_virtual_dword(i->seg(), RMAddr(i), &op2_32);
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
#if (defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
Bit32u flags32;
asmSub32(diff_32, op1_32, op2_32, flags32);
setEFlagsOSZAPC(flags32);
#else
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
diff_32 = op1_32 - op2_32;
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
BX_WRITE_32BIT_REGZ(nnn, diff_32);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
#if !(defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAPC_32(op1_32, op2_32, diff_32, BX_INSTR_SUB32);
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::SUB_EAXId(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op1_32, op2_32, diff_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
op1_32 = EAX;
op2_32 = i->Id();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
diff_32 = op1_32 - op2_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
RAX = diff_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAPC_32(op1_32, op2_32, diff_32, BX_INSTR_SUB32);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::CMP_EdGd(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
Bit32u op2_32, op1_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
op2_32 = BX_READ_32BIT_REG(i->nnn());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
if (i->modC0()) {
op1_32 = BX_READ_32BIT_REG(i->rm());
}
else {
read_virtual_dword(i->seg(), RMAddr(i), &op1_32);
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added new configure option --enable-host-specific-asms, so the user can turn on/off use of native host specific inline asm statements. By default, this option is enabled, so you only need it to disable inline asms in your compile for now. Currently only on x86+GCC environments, will inline asm() statements be used. Eventually, other platforms could specify some asm()s; probably for endian issues such as byte-swapping and unaligned memory accesses. On x86, there are some inline asm()s which do the arithmetic EFLAGS processing so that the lazy flags handling is somewhat bypassed. Eventually, I'll add more, at least for the more common instructions. This adds a little extra performance.
2002-09-23 21:59:18 +04:00
#if (defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
Bit32u flags32;
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
asmCmp32(op1_32, op2_32, flags32);
setEFlagsOSZAPC(flags32);
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
#else
Bit32u diff_32;
diff_32 = op1_32 - op2_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
SET_FLAGS_OSZAPC_32(op1_32, op2_32, diff_32, BX_INSTR_CMP32);
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::CMP_GdEd(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
Bit32u op1_32, op2_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
op1_32 = BX_READ_32BIT_REG(i->nnn());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
if (i->modC0()) {
op2_32 = BX_READ_32BIT_REG(i->rm());
}
else {
read_virtual_dword(i->seg(), RMAddr(i), &op2_32);
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added new configure option --enable-host-specific-asms, so the user can turn on/off use of native host specific inline asm statements. By default, this option is enabled, so you only need it to disable inline asms in your compile for now. Currently only on x86+GCC environments, will inline asm() statements be used. Eventually, other platforms could specify some asm()s; probably for endian issues such as byte-swapping and unaligned memory accesses. On x86, there are some inline asm()s which do the arithmetic EFLAGS processing so that the lazy flags handling is somewhat bypassed. Eventually, I'll add more, at least for the more common instructions. This adds a little extra performance.
2002-09-23 21:59:18 +04:00
#if (defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
Bit32u flags32;
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
asmCmp32(op1_32, op2_32, flags32);
setEFlagsOSZAPC(flags32);
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
#else
Bit32u diff_32;
diff_32 = op1_32 - op2_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
SET_FLAGS_OSZAPC_32(op1_32, op2_32, diff_32, BX_INSTR_CMP32);
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::CMP_EAXId(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
Bit32u op1_32, op2_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
op1_32 = EAX;
op2_32 = i->Id();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added new configure option --enable-host-specific-asms, so the user can turn on/off use of native host specific inline asm statements. By default, this option is enabled, so you only need it to disable inline asms in your compile for now. Currently only on x86+GCC environments, will inline asm() statements be used. Eventually, other platforms could specify some asm()s; probably for endian issues such as byte-swapping and unaligned memory accesses. On x86, there are some inline asm()s which do the arithmetic EFLAGS processing so that the lazy flags handling is somewhat bypassed. Eventually, I'll add more, at least for the more common instructions. This adds a little extra performance.
2002-09-23 21:59:18 +04:00
#if (defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
Bit32u flags32;
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
asmCmp32(op1_32, op2_32, flags32);
setEFlagsOSZAPC(flags32);
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
#else
Bit32u diff_32;
diff_32 = op1_32 - op2_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
SET_FLAGS_OSZAPC_32(op1_32, op2_32, diff_32, BX_INSTR_CMP32);
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::CWDE(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
/* CBW: no flags are effected */
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u temp;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
temp = (Bit16s) AX;
RAX = temp;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::CDQ(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
(cpu64) Merged 2 more. For extdb.cc, essentially I just wrapped the contents of both files with an #ifdef. It's a small file, but I don't use it. Someone else should clean it up.
2002-09-15 05:36:13 +04:00
/* CDQ: no flags are affected */
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (EAX & 0x80000000) {
RDX = 0xFFFFFFFF;
}
else {
RDX = 0x00000000;
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
// Some info on the opcodes at {0F,A6} and {0F,A7}
// On 386 steps A0-B0:
// {OF,A6} = XBTS
// {OF,A7} = IBTS
// On 486 steps A0-B0:
// {OF,A6} = CMPXCHG 8
// {OF,A7} = CMPXCHG 16|32
//
// On 486 >= B steps, and further processors, the
// CMPXCHG instructions were moved to opcodes:
// {OF,B0} = CMPXCHG 8
// {OF,B1} = CMPXCHG 16|32
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::CMPXCHG_XBTS(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
strip '\n' from BX_{INFO,DEBUG,ERROR,PANIC} don't need it, moved the output of it into the general io functions. saves space, as well as removes the confusing output if a '\n' is left off
2001-05-30 22:56:02 +04:00
BX_INFO(("CMPXCHG_XBTS:"));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
UndefinedOpcode(i);
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::CMPXCHG_IBTS(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
strip '\n' from BX_{INFO,DEBUG,ERROR,PANIC} don't need it, moved the output of it into the general io functions. saves space, as well as removes the confusing output if a '\n' is left off
2001-05-30 22:56:02 +04:00
BX_INFO(("CMPXCHG_IBTS:"));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
UndefinedOpcode(i);
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::XADD_EdGd(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
#if (BX_CPU_LEVEL >= 4) || (BX_CPU_LEVEL_HACKED >= 4)
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op2_32, op1_32, sum_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
/* XADD dst(r/m), src(r)
* temp <-- src + dst | sum = op2 + op1
* src <-- dst | op2 = op1
* dst <-- tmp | op1 = sum
*/
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
op2_32 = BX_READ_32BIT_REG(i->nnn());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (i->modC0()) {
op1_32 = BX_READ_32BIT_REG(i->rm());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
sum_32 = op1_32 + op2_32;
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
// and write destination into source
// Note: if both op1 & op2 are registers, the last one written
// should be the sum, as op1 & op2 may be the same register.
// For example: XADD AL, AL
BX_WRITE_32BIT_REGZ(i->nnn(), op1_32);
BX_WRITE_32BIT_REGZ(i->rm(), sum_32);
}
else {
read_RMW_virtual_dword(i->seg(), RMAddr(i), &op1_32);
sum_32 = op1_32 + op2_32;
This was not a cleanup. Those macros were intentionally there to offer a way to substitute more efficient code to do the RMW cases. At the moment, they just map to the normal functions. Sorry, restored the previous version ...
2002-10-25 22:26:29 +04:00
Write_RMW_virtual_dword(sum_32);
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
/* and write destination into source */
BX_WRITE_32BIT_REGZ(i->nnn(), op1_32);
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAPC_32(op1_32, op2_32, sum_32, BX_INSTR_XADD32);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
#else
Add plugin support to Bochs by merging all the changes from the BRANCH_PLUGINS branch! Authors: Bryce Denney Christophe Bothamy Kevin Lawton (we grabbed a lot of plugin code from plex86) Testing help from: Volker Ruppert Don Becker (Psyon) Jeremy Parsons (Br'fin) The change log is too long to paste in here. To read the change log, do cvs log patches/patch.final-from-BRANCH_PLUGINS.gz All the changes and a detailed description are contained in a patch called patch.final-from-BRANCH_PLUGINS.gz. To look at the complete patch, do cvs upd -r1.1 patches/patch.final-from-BRANCH_PLUGINS.gz Then you will have a local copy of the patch, which you can gunzip and play with however you want. Modified Files: .bochsrc Makefile.in aclocal.m4 bochs.h config.h.in configure configure.in gdbstub.cc logio.cc main.cc pc_system.cc pc_system.h state_file.h bios/Makefile.in bios/rombios.c cpu/Makefile.in cpu/access.cc cpu/apic.cc cpu/arith16.cc cpu/arith32.cc cpu/arith8.cc cpu/cpu.cc cpu/cpu.h cpu/ctrl_xfer32.cc cpu/exception.cc cpu/fetchdecode.cc cpu/fetchdecode64.cc cpu/flag_ctrl.cc cpu/flag_ctrl_pro.cc cpu/init.cc cpu/io.cc cpu/logical16.cc cpu/logical32.cc cpu/logical8.cc cpu/paging.cc cpu/proc_ctrl.cc cpu/protect_ctrl.cc cpu/segment_ctrl_pro.cc cpu/shift16.cc cpu/shift32.cc cpu/stack64.cc cpu/string.cc cpu/tasking.cc debug/Makefile.in debug/dbg_main.cc disasm/Makefile.in doc/docbook/user/user.dbk dynamic/Makefile.in fpu/Makefile.in gui/Makefile.in gui/amigaos.cc gui/beos.cc gui/carbon.cc gui/control.cc gui/control.h gui/gui.cc gui/gui.h gui/keymap.cc gui/keymap.h gui/macintosh.cc gui/nogui.cc gui/rfb.cc gui/sdl.cc gui/sdlkeys.h gui/siminterface.cc gui/siminterface.h gui/term.cc gui/win32.cc gui/wx.cc gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc gui/wxmain.h gui/x.cc gui/keymaps/sdl-pc-de.map gui/keymaps/sdl-pc-us.map gui/keymaps/x11-pc-de.map instrument/example0/instrument.h instrument/example1/instrument.h instrument/stubs/instrument.cc instrument/stubs/instrument.h iodev/Makefile.in iodev/biosdev.cc iodev/biosdev.h iodev/cdrom.cc iodev/cmos.cc iodev/cmos.h iodev/devices.cc iodev/dma.cc iodev/dma.h iodev/eth_fbsd.cc iodev/eth_linux.cc iodev/eth_null.cc iodev/eth_tap.cc iodev/floppy.cc iodev/floppy.h iodev/guest2host.cc iodev/guest2host.h iodev/harddrv.cc iodev/harddrv.h iodev/iodebug.cc iodev/iodebug.h iodev/iodev.h iodev/keyboard.cc iodev/keyboard.h iodev/ne2k.cc iodev/ne2k.h iodev/parallel.cc iodev/parallel.h iodev/pci.cc iodev/pci.h iodev/pci2isa.cc iodev/pci2isa.h iodev/pic.cc iodev/pic.h iodev/pit.cc iodev/pit.h iodev/pit_wrap.cc iodev/pit_wrap.h iodev/sb16.cc iodev/sb16.h iodev/scancodes.cc iodev/scancodes.h iodev/serial.cc iodev/serial.h iodev/slowdown_timer.cc iodev/slowdown_timer.h iodev/unmapped.cc iodev/unmapped.h iodev/vga.cc iodev/vga.h memory/Makefile.in memory/memory.cc memory/memory.h memory/misc_mem.cc misc/bximage.c misc/niclist.c Added Files: README-plugins extplugin.h ltdl.c ltdl.h ltdlconf.h.in ltmain.sh plugin.cc plugin.h
2002-10-25 01:07:56 +04:00
BX_INFO (("XADD_EdGd not supported for cpulevel <= 3"));
- replace new preprocessor directive "#panic" with call to BX_INFO and UndefinedOpcode().
2002-10-02 08:01:45 +04:00
UndefinedOpcode(i);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
#endif
}
void
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
BX_CPU_C::ADD_EEdId(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
Bit32u op2_32, op1_32, sum_32;
I rehashed the way the EFLAGS register was stored internally. All the EFLAGS bits used to be cached in separate fields. I left a few of them in separate fields for now - might remove them at some point also. When the arithmetic fields are known (ie they're not in lazy mode), they are all cached in a 32-bit EFLAGS image, just like the x86 EFLAGS register expects. All other eflags are store in the 32-bit register also, with a few also mirrored in separate fields for now. The reason I did this, was so that on x86 hosts, asm() statements can be #ifdef'd in to do the calculation and get the native eflags results very cheaply. Just to test that it works, I coded ADD_EdId() and ADD_EwIw() with some conditionally compiled asm()s for accelerated eflags processing and it works. -Kevin
2002-09-08 08:08:14 +04:00
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
op2_32 = i->Id();
I rehashed the way the EFLAGS register was stored internally. All the EFLAGS bits used to be cached in separate fields. I left a few of them in separate fields for now - might remove them at some point also. When the arithmetic fields are known (ie they're not in lazy mode), they are all cached in a 32-bit EFLAGS image, just like the x86 EFLAGS register expects. All other eflags are store in the 32-bit register also, with a few also mirrored in separate fields for now. The reason I did this, was so that on x86 hosts, asm() statements can be #ifdef'd in to do the calculation and get the native eflags results very cheaply. Just to test that it works, I coded ADD_EdId() and ADD_EwIw() with some conditionally compiled asm()s for accelerated eflags processing and it works. -Kevin
2002-09-08 08:08:14 +04:00
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
read_RMW_virtual_dword(i->seg(), RMAddr(i), &op1_32);
Split out JZ/JNZ instructions from JCC because they were called so frequently. Coded asm() statements for INC/DEC_ERX() instructions. Cleaned up the iCache a litle including a bug fix. The generation ID was decrementing the whole field including some high meta bits. That could roll over after 1 Billion cycles. I know only decrement if the field is valid, to save the write. I implemented inline functions which can serve the value of the arithmetic flags if they are cached, and redirect to the lazy_flags.cc routines if not. Most of this was just prep work for adding more asm() statements for native eflags processing when on x86.
2002-09-22 05:52:21 +04:00
Added new configure option --enable-host-specific-asms, so the user can turn on/off use of native host specific inline asm statements. By default, this option is enabled, so you only need it to disable inline asms in your compile for now. Currently only on x86+GCC environments, will inline asm() statements be used. Eventually, other platforms could specify some asm()s; probably for endian issues such as byte-swapping and unaligned memory accesses. On x86, there are some inline asm()s which do the arithmetic EFLAGS processing so that the lazy flags handling is somewhat bypassed. Eventually, I'll add more, at least for the more common instructions. This adds a little extra performance.
2002-09-23 21:59:18 +04:00
#if (defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
Bit32u flags32;
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
asmAdd32(sum_32, op1_32, op2_32, flags32);
setEFlagsOSZAPC(flags32);
Split out JZ/JNZ instructions from JCC because they were called so frequently. Coded asm() statements for INC/DEC_ERX() instructions. Cleaned up the iCache a litle including a bug fix. The generation ID was decrementing the whole field including some high meta bits. That could roll over after 1 Billion cycles. I know only decrement if the field is valid, to save the write. I implemented inline functions which can serve the value of the arithmetic flags if they are cached, and redirect to the lazy_flags.cc routines if not. Most of this was just prep work for adding more asm() statements for native eflags processing when on x86.
2002-09-22 05:52:21 +04:00
#else
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
sum_32 = op1_32 + op2_32;
Split out JZ/JNZ instructions from JCC because they were called so frequently. Coded asm() statements for INC/DEC_ERX() instructions. Cleaned up the iCache a litle including a bug fix. The generation ID was decrementing the whole field including some high meta bits. That could roll over after 1 Billion cycles. I know only decrement if the field is valid, to save the write. I implemented inline functions which can serve the value of the arithmetic flags if they are cached, and redirect to the lazy_flags.cc routines if not. Most of this was just prep work for adding more asm() statements for native eflags processing when on x86.
2002-09-22 05:52:21 +04:00
#endif
This was not a cleanup. Those macros were intentionally there to offer a way to substitute more efficient code to do the RMW cases. At the moment, they just map to the normal functions. Sorry, restored the previous version ...
2002-10-25 22:26:29 +04:00
Write_RMW_virtual_dword(sum_32);
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
#if !(defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
SET_FLAGS_OSZAPC_32(op1_32, op2_32, sum_32, BX_INSTR_ADD32);
#endif
}
void
BX_CPU_C::ADD_EGdId(bxInstruction_c *i)
{
Bit32u op2_32, op1_32, sum_32;
op2_32 = i->Id();
op1_32 = BX_READ_32BIT_REG(i->rm());
I rehashed the way the EFLAGS register was stored internally. All the EFLAGS bits used to be cached in separate fields. I left a few of them in separate fields for now - might remove them at some point also. When the arithmetic fields are known (ie they're not in lazy mode), they are all cached in a 32-bit EFLAGS image, just like the x86 EFLAGS register expects. All other eflags are store in the 32-bit register also, with a few also mirrored in separate fields for now. The reason I did this, was so that on x86 hosts, asm() statements can be #ifdef'd in to do the calculation and get the native eflags results very cheaply. Just to test that it works, I coded ADD_EdId() and ADD_EwIw() with some conditionally compiled asm()s for accelerated eflags processing and it works. -Kevin
2002-09-08 08:08:14 +04:00
Added new configure option --enable-host-specific-asms, so the user can turn on/off use of native host specific inline asm statements. By default, this option is enabled, so you only need it to disable inline asms in your compile for now. Currently only on x86+GCC environments, will inline asm() statements be used. Eventually, other platforms could specify some asm()s; probably for endian issues such as byte-swapping and unaligned memory accesses. On x86, there are some inline asm()s which do the arithmetic EFLAGS processing so that the lazy flags handling is somewhat bypassed. Eventually, I'll add more, at least for the more common instructions. This adds a little extra performance.
2002-09-23 21:59:18 +04:00
#if (defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
Bit32u flags32;
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
asmAdd32(sum_32, op1_32, op2_32, flags32);
setEFlagsOSZAPC(flags32);
I rehashed the way the EFLAGS register was stored internally. All the EFLAGS bits used to be cached in separate fields. I left a few of them in separate fields for now - might remove them at some point also. When the arithmetic fields are known (ie they're not in lazy mode), they are all cached in a 32-bit EFLAGS image, just like the x86 EFLAGS register expects. All other eflags are store in the 32-bit register also, with a few also mirrored in separate fields for now. The reason I did this, was so that on x86 hosts, asm() statements can be #ifdef'd in to do the calculation and get the native eflags results very cheaply. Just to test that it works, I coded ADD_EdId() and ADD_EwIw() with some conditionally compiled asm()s for accelerated eflags processing and it works. -Kevin
2002-09-08 08:08:14 +04:00
#else
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
sum_32 = op1_32 + op2_32;
I rehashed the way the EFLAGS register was stored internally. All the EFLAGS bits used to be cached in separate fields. I left a few of them in separate fields for now - might remove them at some point also. When the arithmetic fields are known (ie they're not in lazy mode), they are all cached in a 32-bit EFLAGS image, just like the x86 EFLAGS register expects. All other eflags are store in the 32-bit register also, with a few also mirrored in separate fields for now. The reason I did this, was so that on x86 hosts, asm() statements can be #ifdef'd in to do the calculation and get the native eflags results very cheaply. Just to test that it works, I coded ADD_EdId() and ADD_EwIw() with some conditionally compiled asm()s for accelerated eflags processing and it works. -Kevin
2002-09-08 08:08:14 +04:00
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Split out reg-reg and reg-memory cases for a few other high-profile instructions, mainly variants of MOV. Had to update fetchdecode64 to keep it inline with the 32-bit mods.
2002-09-29 23:21:38 +04:00
BX_WRITE_32BIT_REGZ(i->rm(), sum_32);
I rehashed the way the EFLAGS register was stored internally. All the EFLAGS bits used to be cached in separate fields. I left a few of them in separate fields for now - might remove them at some point also. When the arithmetic fields are known (ie they're not in lazy mode), they are all cached in a 32-bit EFLAGS image, just like the x86 EFLAGS register expects. All other eflags are store in the 32-bit register also, with a few also mirrored in separate fields for now. The reason I did this, was so that on x86 hosts, asm() statements can be #ifdef'd in to do the calculation and get the native eflags results very cheaply. Just to test that it works, I coded ADD_EdId() and ADD_EwIw() with some conditionally compiled asm()s for accelerated eflags processing and it works. -Kevin
2002-09-08 08:08:14 +04:00
Added new configure option --enable-host-specific-asms, so the user can turn on/off use of native host specific inline asm statements. By default, this option is enabled, so you only need it to disable inline asms in your compile for now. Currently only on x86+GCC environments, will inline asm() statements be used. Eventually, other platforms could specify some asm()s; probably for endian issues such as byte-swapping and unaligned memory accesses. On x86, there are some inline asm()s which do the arithmetic EFLAGS processing so that the lazy flags handling is somewhat bypassed. Eventually, I'll add more, at least for the more common instructions. This adds a little extra performance.
2002-09-23 21:59:18 +04:00
#if !(defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
I rehashed the way the EFLAGS register was stored internally. All the EFLAGS bits used to be cached in separate fields. I left a few of them in separate fields for now - might remove them at some point also. When the arithmetic fields are known (ie they're not in lazy mode), they are all cached in a 32-bit EFLAGS image, just like the x86 EFLAGS register expects. All other eflags are store in the 32-bit register also, with a few also mirrored in separate fields for now. The reason I did this, was so that on x86 hosts, asm() statements can be #ifdef'd in to do the calculation and get the native eflags results very cheaply. Just to test that it works, I coded ADD_EdId() and ADD_EwIw() with some conditionally compiled asm()s for accelerated eflags processing and it works. -Kevin
2002-09-08 08:08:14 +04:00
SET_FLAGS_OSZAPC_32(op1_32, op2_32, sum_32, BX_INSTR_ADD32);
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::ADC_EdId(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
- Apply patch.replace-Boolean rev 1.3. Every "Boolean" is now changed to a "bx_bool" which is always defined as Bit32u on all platforms. In Carbon specific code, Boolean is still used because the Carbon header files define it to unsigned char. - this fixes bug [ 623152 ] MacOSX: Triple Exception Booting win95. The bug was that some code in Bochs depends on Boolean to be a 32 bit value. (This should be fixed, but I don't know all the places where it needs to be fixed yet.) Because Carbon defined Boolean as an unsigned char, Bochs just followed along and used the unsigned char definition to avoid compile problems. This exposed the dependency on 32 bit Boolean on MacOS X only and led to major simulation problems, that could only be reproduced and debugged on that platform. - On the mailing list we debated whether to make all Booleans into "bool" or our own type. I chose bx_bool for several reasons. 1. Unlike C++'s bool, we can guarantee that bx_bool is the same size on all platforms, which makes it much less likely to have more platform-specific simulation differences in the future. (I spent hours on a borrowed MacOSX machine chasing bug 618388 before discovering that different sized Booleans were the problem, and I don't want to repeat that.) 2. We still have at least one dependency on 32 bit Booleans which must be fixed some time, but I don't want to risk introducing new bugs into the simulation just before the 2.0 release. Modified Files: bochs.h config.h.in gdbstub.cc logio.cc main.cc pc_system.cc pc_system.h plugin.cc plugin.h bios/rombios.c cpu/apic.cc cpu/arith16.cc cpu/arith32.cc cpu/arith64.cc cpu/arith8.cc cpu/cpu.cc cpu/cpu.h cpu/ctrl_xfer16.cc cpu/ctrl_xfer32.cc cpu/ctrl_xfer64.cc cpu/data_xfer16.cc cpu/data_xfer32.cc cpu/data_xfer64.cc cpu/debugstuff.cc cpu/exception.cc cpu/fetchdecode.cc cpu/flag_ctrl_pro.cc cpu/init.cc cpu/io_pro.cc cpu/lazy_flags.cc cpu/lazy_flags.h cpu/mult16.cc cpu/mult32.cc cpu/mult64.cc cpu/mult8.cc cpu/paging.cc cpu/proc_ctrl.cc cpu/segment_ctrl_pro.cc cpu/stack_pro.cc cpu/tasking.cc debug/dbg_main.cc debug/debug.h debug/sim2.cc disasm/dis_decode.cc disasm/disasm.h doc/docbook/Makefile docs-html/cosimulation.html fpu/wmFPUemu_glue.cc gui/amigaos.cc gui/beos.cc gui/carbon.cc gui/gui.cc gui/gui.h gui/keymap.cc gui/keymap.h gui/macintosh.cc gui/nogui.cc gui/rfb.cc gui/sdl.cc gui/siminterface.cc gui/siminterface.h gui/term.cc gui/win32.cc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/x.cc instrument/example0/instrument.cc instrument/example0/instrument.h instrument/example1/instrument.cc instrument/example1/instrument.h instrument/stubs/instrument.cc instrument/stubs/instrument.h iodev/cdrom.cc iodev/cdrom.h iodev/cdrom_osx.cc iodev/cmos.cc iodev/devices.cc iodev/dma.cc iodev/dma.h iodev/eth_arpback.cc iodev/eth_packetmaker.cc iodev/eth_packetmaker.h iodev/floppy.cc iodev/floppy.h iodev/guest2host.h iodev/harddrv.cc iodev/harddrv.h iodev/ioapic.cc iodev/ioapic.h iodev/iodebug.cc iodev/iodev.h iodev/keyboard.cc iodev/keyboard.h iodev/ne2k.h iodev/parallel.h iodev/pci.cc iodev/pci.h iodev/pic.h iodev/pit.cc iodev/pit.h iodev/pit_wrap.cc iodev/pit_wrap.h iodev/sb16.cc iodev/sb16.h iodev/serial.cc iodev/serial.h iodev/vga.cc iodev/vga.h memory/memory.h memory/misc_mem.cc
2002-10-25 15:44:41 +04:00
bx_bool temp_CF;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
I updated code that was using !!get_CF() (or other arithmetic flag) to use getB_CF() etc. getB_CF() and friends are only for a relatively small number of cases where a true boolean/binary number (0 or 1) is required rather than 0 or non-0 as is returned by get_CF().
2002-09-24 22:33:38 +04:00
temp_CF = getB_CF();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op2_32, op1_32, sum_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
op2_32 = i->Id();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (i->modC0()) {
op1_32 = BX_READ_32BIT_REG(i->rm());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
sum_32 = op1_32 + op2_32 + temp_CF;
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
BX_WRITE_32BIT_REGZ(i->rm(), sum_32);
}
else {
read_RMW_virtual_dword(i->seg(), RMAddr(i), &op1_32);
sum_32 = op1_32 + op2_32 + temp_CF;
This was not a cleanup. Those macros were intentionally there to offer a way to substitute more efficient code to do the RMW cases. At the moment, they just map to the normal functions. Sorry, restored the previous version ...
2002-10-25 22:26:29 +04:00
Write_RMW_virtual_dword(sum_32);
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAPC_32_CF(op1_32, op2_32, sum_32, BX_INSTR_ADC32,
temp_CF);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::SUB_EdId(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op2_32, op1_32, diff_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
op2_32 = i->Id();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (i->modC0()) {
op1_32 = BX_READ_32BIT_REG(i->rm());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
diff_32 = op1_32 - op2_32;
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
BX_WRITE_32BIT_REGZ(i->rm(), diff_32);
}
else {
read_RMW_virtual_dword(i->seg(), RMAddr(i), &op1_32);
diff_32 = op1_32 - op2_32;
This was not a cleanup. Those macros were intentionally there to offer a way to substitute more efficient code to do the RMW cases. At the moment, they just map to the normal functions. Sorry, restored the previous version ...
2002-10-25 22:26:29 +04:00
Write_RMW_virtual_dword(diff_32);
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAPC_32(op1_32, op2_32, diff_32, BX_INSTR_SUB32);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::CMP_EdId(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
Bit32u op2_32, op1_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
op2_32 = i->Id();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
if (i->modC0()) {
op1_32 = BX_READ_32BIT_REG(i->rm());
}
else {
read_virtual_dword(i->seg(), RMAddr(i), &op1_32);
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added new configure option --enable-host-specific-asms, so the user can turn on/off use of native host specific inline asm statements. By default, this option is enabled, so you only need it to disable inline asms in your compile for now. Currently only on x86+GCC environments, will inline asm() statements be used. Eventually, other platforms could specify some asm()s; probably for endian issues such as byte-swapping and unaligned memory accesses. On x86, there are some inline asm()s which do the arithmetic EFLAGS processing so that the lazy flags handling is somewhat bypassed. Eventually, I'll add more, at least for the more common instructions. This adds a little extra performance.
2002-09-23 21:59:18 +04:00
#if (defined(__i386__) && defined(__GNUC__) && BX_SupportHostAsms)
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
Bit32u flags32;
Moved the asm() statements from the arithmetic instruction emulation into inline functions with asm() statements in cpu.h. This cleans up the *.cc code (which now doesn't have any asm()s in it), and centralizes the asm() code so constraints can be modified in one place. This also makes it easier to cover more instructions with asm()s for more efficient eflags handling.
2002-10-08 02:51:58 +04:00
asmCmp32(op1_32, op2_32, flags32);
setEFlagsOSZAPC(flags32);
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
#else
Bit32u diff_32;
diff_32 = op1_32 - op2_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added more x86 specific asm() code to directly handle eflags return values for some common instructions (like test/and/cmp). Only compiles in on x86 of course.
2002-09-23 02:22:16 +04:00
SET_FLAGS_OSZAPC_32(op1_32, op2_32, diff_32, BX_INSTR_CMP32);
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::NEG_Ed(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op1_32, diff_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (i->modC0()) {
op1_32 = BX_READ_32BIT_REG(i->rm());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
diff_32 = 0 - op1_32;
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
BX_WRITE_32BIT_REGZ(i->rm(), diff_32);
}
else {
read_RMW_virtual_dword(i->seg(), RMAddr(i), &op1_32);
diff_32 = 0 - op1_32;
This was not a cleanup. Those macros were intentionally there to offer a way to substitute more efficient code to do the RMW cases. At the moment, they just map to the normal functions. Sorry, restored the previous version ...
2002-10-25 22:26:29 +04:00
Write_RMW_virtual_dword(diff_32);
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAPC_32(op1_32, 0, diff_32, BX_INSTR_NEG32);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::INC_Ed(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op1_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (i->modC0()) {
op1_32 = BX_READ_32BIT_REG(i->rm());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
op1_32++;
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
BX_WRITE_32BIT_REGZ(i->rm(), op1_32);
}
else {
read_RMW_virtual_dword(i->seg(), RMAddr(i), &op1_32);
op1_32++;
This was not a cleanup. Those macros were intentionally there to offer a way to substitute more efficient code to do the RMW cases. At the moment, they just map to the normal functions. Sorry, restored the previous version ...
2002-10-25 22:26:29 +04:00
Write_RMW_virtual_dword(op1_32);
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAP_32(0, 0, op1_32, BX_INSTR_INC32);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::DEC_Ed(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op1_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (i->modC0()) {
op1_32 = BX_READ_32BIT_REG(i->rm());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
op1_32--;
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
BX_WRITE_32BIT_REGZ(i->rm(), op1_32);
}
else {
read_RMW_virtual_dword(i->seg(), RMAddr(i), &op1_32);
op1_32--;
This was not a cleanup. Those macros were intentionally there to offer a way to substitute more efficient code to do the RMW cases. At the moment, they just map to the normal functions. Sorry, restored the previous version ...
2002-10-25 22:26:29 +04:00
Write_RMW_virtual_dword(op1_32);
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAP_32(0, 0, op1_32, BX_INSTR_DEC32);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::CMPXCHG_EdGd(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
#if (BX_CPU_LEVEL >= 4) || (BX_CPU_LEVEL_HACKED >= 4)
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op2_32, op1_32, diff_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (i->modC0()) {
op1_32 = BX_READ_32BIT_REG(i->rm());
}
else {
read_RMW_virtual_dword(i->seg(), RMAddr(i), &op1_32);
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
diff_32 = EAX - op1_32;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
SET_FLAGS_OSZAPC_32(EAX, op1_32, diff_32, BX_INSTR_CMP32);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (diff_32 == 0) { // if accumulator == dest
// ZF = 1
set_ZF(1);
// dest <-- src
op2_32 = BX_READ_32BIT_REG(i->nnn());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (i->modC0()) {
BX_WRITE_32BIT_REGZ(i->rm(), op2_32);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else {
This was not a cleanup. Those macros were intentionally there to offer a way to substitute more efficient code to do the RMW cases. At the moment, they just map to the normal functions. Sorry, restored the previous version ...
2002-10-25 22:26:29 +04:00
Write_RMW_virtual_dword(op2_32);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
}
else {
// ZF = 0
set_ZF(0);
// accumulator <-- dest
RAX = op1_32;
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
#else
strip '\n' from BX_{INFO,DEBUG,ERROR,PANIC} don't need it, moved the output of it into the general io functions. saves space, as well as removes the confusing output if a '\n' is left off
2001-05-30 22:56:02 +04:00
BX_PANIC(("CMPXCHG_EdGd:"));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
#endif
}
void
Updated accessing of modrm/sib addressing information to use accessors. This lets me work on compressing the size of fetch-decode structure (now called bxInstruction_c). I've reduced it down to about 76 bytes. We should be able to do much better soon. I needed the abstraction of the accessors, so I have a lot of freedom to re-arrange things without making massive future changes. Lost a few percent of performance in these mods, but my main focus was to get the abstraction.
2002-09-18 02:50:53 +04:00
BX_CPU_C::CMPXCHG8B(bxInstruction_c *i)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
#if (BX_CPU_LEVEL >= 5) || (BX_CPU_LEVEL_HACKED >= 5)
- checked in cmpxchg8b patch from Michael Hohmuth <hohmuth@innocent.com>
2001-11-18 01:22:03 +03:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
Bit32u op1_64_lo, op1_64_hi, diff;
- checked in cmpxchg8b patch from Michael Hohmuth <hohmuth@innocent.com>
2001-11-18 01:22:03 +03:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (i->modC0()) {
BX_INFO(("CMPXCHG8B: dest is reg: #UD"));
UndefinedOpcode(i);
}
- checked in cmpxchg8b patch from Michael Hohmuth <hohmuth@innocent.com>
2001-11-18 01:22:03 +03:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
read_virtual_dword(i->seg(), RMAddr(i), &op1_64_lo);
read_RMW_virtual_dword(i->seg(), RMAddr(i) + 4, &op1_64_hi);
- checked in cmpxchg8b patch from Michael Hohmuth <hohmuth@innocent.com>
2001-11-18 01:22:03 +03:00
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
diff = EAX - op1_64_lo;
diff |= EDX - op1_64_hi;
- checked in cmpxchg8b patch from Michael Hohmuth <hohmuth@innocent.com>
2001-11-18 01:22:03 +03:00
// SET_FLAGS_OSZAPC_32(EAX, op1_32, diff_32, BX_INSTR_CMP32);
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
if (diff == 0) { // if accumulator == dest
// ZF = 1
set_ZF(1);
// dest <-- src
This was not a cleanup. Those macros were intentionally there to offer a way to substitute more efficient code to do the RMW cases. At the moment, they just map to the normal functions. Sorry, restored the previous version ...
2002-10-25 22:26:29 +04:00
Write_RMW_virtual_dword(ECX);
Added ./configure option --enable-all-optimizations which turns on all available optimizations in one shot. Finished one last case of an instruction which could but didn't use the Read-Modify-Write variants of access.cc functions. Started going through the integer instructions, merging obvious cases where there are two "if (modrm==11b) {" clauses and very little action in between, and cleaning up the aweful indentation leftover from many years ago when those instructions were implemented using cut-and-paste. We may get a little extra performance out of these mods, but they'll also be easier after I'm finished to enhance with asm() statements to knock out the lazy flags processing on x86.
2002-09-30 06:02:06 +04:00
write_virtual_dword(i->seg(), RMAddr(i), &EBX);
}
else {
// ZF = 0
set_ZF(0);
// accumulator <-- dest
RAX = op1_64_lo;
RDX = op1_64_hi;
}
(cpu64) Merged 2 more. For extdb.cc, essentially I just wrapped the contents of both files with an #ifdef. It's a small file, but I don't use it. Someone else should clean it up.
2002-09-15 05:36:13 +04:00
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
#else
Merged patch-unallowed-lock-cases patch. According to the Intel manuals: The LOCK prefix can be prepended only to the following instructions and only to those forms of the instructions where the destination operand is a memory operand: ADD, ADC, AND, BTC, BTR, BTS, CMPXCHG, CMPXCH8B, DEC, INC, NEG, NOT, OR, SBB, SUB, XOR, XADD, and XCHG. If the LOCK prefix is used with one of these instructions and the source operand is a memory operand, an undefined opcode exception (#UD) will be generated. An undefined opcode exception will also be generated if the LOCK prefix is used with any instruction not in the above list. Checking of the LOCK prefix done in fetchDecode state and not overloads Bochs's execution.
2003-04-05 16:16:53 +04:00
BX_INFO(("CMPXCHG8B: not implemented in CPU_LEVEL < 5"));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
UndefinedOpcode(i);
#endif
}
Reference in New Issue Copy Permalink