Commit Graph

101 Commits

Author SHA1 Message Date
Kevin Lawton
80dd7a07ec Removed references to building libextdb.a. It doesn't seem to
be used at all, and Peter didn't want it.  "extdb.o" is compiled
into libcpu.a, if configured for it.

Removed a few #warnings for x86-64 compile, based on Peter's
line-item comments regarding the warnings I inserted during
the port/merge.
2002-09-15 15:10:21 +00:00
Kevin Lawton
a367d3b742 Force global pages as well as physical address extensions when
x86-64 support is enabled.  Otherwise, CR4 accesses were
tripping a fault.
2002-09-15 13:52:22 +00:00
Kevin Lawton
278e27d5fe Merged proc_ctrl.cc. Also fixed a bug in CR4 reloading; we were
printing a message when a reserved bit was set, but not causing
a #GP(0).  As well, I force a new PAE support option to 1 when
Hammer support is enabled.
2002-09-14 23:17:55 +00:00
Kevin Lawton
aaeeab5850 Reverted back to using "ar" for making libraries. I had to
declare libs from cpu and cpu64 twice to make the linker
pick up all the symbols.
2002-09-14 05:46:57 +00:00
Kevin Lawton
d16fcfce91 (cpu64) Merged fetchdecode.cc. Also, I had some problems with
circular dependencies between 3 cpu related libs that I need
as part of this transition.  I changed the "ar rv" to "ld -i -o"
to do an incremental load instead of an archive.  Hope this
doesn't break any platforms.  We can reset this later.
2002-09-13 23:59:24 +00:00
Kevin Lawton
f05d453b6c Moved 64-bit only files from cpu64 to cpu and modified the Makefiles
accordingly.  These files cause no conflicts at all, since they
are not used in 32-bit compiles.
2002-09-13 15:53:22 +00:00
Kevin Lawton
c520824de5 Changed configure and the cpu + cpu64 dir Makefiles so it's easy
to incrementally merge files.  For a test, shift16.cc is always
compiled in the cpu/ directory regardless of 32/64-bit configure.
Ultimately, all files will migrate from cpu64 to cpu.
2002-09-13 02:56:14 +00:00
Bryce Denney
ccc6ac804c - integrate Peter Tattam's x86-64 emulation code into the main branch!
This adds a whole new directory cpu64 with the new emulation code.
  Very few changes were necessary outside cpu64.  To try it, configure
  with --enable-x86-64 and make.
- also this adds Peter Tattam's external debugger interface.
- modified files: Makefile.in bochs.h config.h.in configure.in
  load32bitOShack.cc logio.cc cpu/Makefile.in cpu/cpu.cc debug/dbg_main.cc
- added files: cpu/extdb.cc cpu/extdb.h and cpu64/*
2002-09-12 07:23:47 +00:00
Kevin Lawton
08576b24be I implemented Global pages. Though, I haven't tested them. :^)
You need to use '--enable-global-pages' to configure in support.
If you have something to boot that uses them, give them a
spin.  Really the were introduced for PPro and above, but
I haven't put in any limits.  CPUID and CR4 report the proper
bits when configured, regardless of --enable-cpu-level at the
moment.
2002-09-10 03:52:32 +00:00
Bryce Denney
9a045c7340 - since wxWindows+debugger+readline is a combination that currently doesn't
work (control-C kills process instead of returning to debugger prompt), give
  a configure-time error if they are enabled together.  If we can fix the
  signal problem in readline, this check can be removed.
2002-09-05 19:59:20 +00:00
Bryce Denney
2c9fcbb147 - somehow I lost one important line in my last checkin that defines WX_CONFIG 2002-09-05 15:49:48 +00:00
Bryce Denney
892eaab88c - in wxwindows compile, only include the wxwindows cflags on the few
files that need them.  This is more in line with the other gui libraries,
  and the compile line is easier to read.
- modified: Makefile.in configure.in configure gui/Makefile.in
2002-09-05 15:12:13 +00:00
Kevin Lawton
746f09b427 There's a bug in the repeated IO & mem copy speedups. I
added --enable-repeat-speedups with default to disabled.
Reconfigure/recompile and the speedup code will be #ifdef'd
out for now.  It manifested as junk written to the VGA screen
while booting/running Windows.

Also made some more mods to the main cpu loop.  Moved the
handling of EXT/errorno outside the main loop, much like
the extra EIP/ESP commits were moved, for a little better
performance.

I changed the fetch_ptr/bytesleft method of fetching to
a slightly different model, which calculates a window
for which EIP will be valid (land on the current page),
and a bias which when applied to EIP will be from
0..upper_page_limit.  Speed is about the same for either
method, but a pseudo-op/threaded-interpreter will plug
in better with this and be faster.
2002-09-02 18:44:35 +00:00
Kevin Lawton
3a5f338419 Integrated patches for:
- Paging code rehash.  You must now use --enable-4meg-pages to
    use 4Meg pages, with the default of disabled, since we don't well
    support 4Meg pages yet.  Paging table walks model a real CPU
    more closely now, and I fixed some bugs in the old logic.
  - Segment check redundancy elimination.  After a segment is loaded,
    reads and writes are marked when a segment type check succeeds, and
    they are skipped thereafter, when possible.
  - Repeated IO and memory string copy acceleration.  Only some variants
    of instructions are available on all platforms, word and dword
    variants only on x86 for the moment due to alignment and endian issues.
    This is compiled in currently with no option - I should add a configure
    option.
  - Added a guest linear address to host TLB.  Actually, I just stick
    the host address (mem.vector[addr] address) in the upper 29 bits
    of the field 'combined_access' since they are unused.  Convenient
    for now.  I'm only storing page frame addresses.  This was the
    simplest for of such a TLB.  We can likely enhance this.  Also,
    I only accelerated the normal read/write routines in access.cc.
    Could also modify the read-modify-write versions too.  You must
    use --enable-guest2host-tlb, to try this out.  Currently speeds
    up Win95 boot time by about 3.5% for me.  More ground to cover...
  - Minor mods to CPUI/MOV_CdRd for CMOV.
  - Integrated enhancements from Volker to getHostMemAddr() for PCI
    being enabled.
2002-09-01 20:12:09 +00:00
Bryce Denney
61ff7bbb06 - fix it so that cpu/mmx.o is compiled in when MMX is enabled. 2002-08-26 16:40:21 +00:00
Bryce Denney
bc78eaaa76 - add configure option --enable-mmx to prepare for Stanislav Shwartsman's
MMX patch
2002-08-26 16:17:10 +00:00
Bryce Denney
26385f2866 - I've added lots of comments in siminterface.h, and tried to clean up
the terminology a bit.  In particular, the term "gui" has started
  to mean different things in different contexts, so I've defined
  some more specific names for the parts of the user interface, and
  updated comments and some variable names to reflect it.  See
  siminterface.h for a more complete description of all of these.

    VGAW: VGA display window and toolbar buttons, the traditional Bochs
      display which is ported to X, win32, MacOS X, etc.  Implemented
      in gui/gui.* and platform dependent gui/*.cc files.
    CI: configuration interface that lets the user change settings such
      as floppy disk image, ne2k settings, log options.  The CI consists
      of two parts: configuration user interface (CUI) which does the
      actual rendering to the screen and handles key/mouse/menu events,
      and the siminterface object.
    CUI: configuration user interface.  This handles the user interactions
      that allow the user to configure Bochs.  To actually change any
      values it talks to the siminterface object.  One implementation of
      the CUI is the text-mode menus in gui/control.cc.  Another
      implementation is (will be) the wxWindows menus and dialogs in
      gui/wxmain.cc.
    siminterface: the glue between the CUI and the simulation code,
      accessible throughout the code by the global variable
        bx_simulator_interface_c *SIM;
      Among other things, siminterface methods allow the simulator to ask the
      CUI to display things or ask for user input, and allows the CUI
      to query and modify variables in the simulation code.


    GUI: Literally, "graphical user interface".  Until the configuration menus
      and wxWindows came along, everyone understood that "gui" referred to the
      VGA display window and the toolbar buttons because that's all there
      was.  Now that we have the wxWindows code, which implements both the VGAW
      and the CUI, while all other platforms implement only the VGAW, it's not
      so clear.  So, I'm trying to use VGAW, CI, and CUI consistently since
      they are more specific.
    control panel: This has been used as another name for the configuration
      interface.  "control panel" is also somewhat unspecific and it sounds
      like it would be graphical with buttons and sliders, but our text-mode
      thing is not graphical at all.  I've replaced "control panel" with
      "configuration interface" wherever I could find it.  In configure script,
      the --disable-control-panel option is still supported, but it politely
      suggests that you use --disable-config-interface instead.
- clean up comments in siminterface,wx* code
- add comments and examples for bx_param_* and BxEvents
- remove some obsolete stuff: notify_*_args,
  bx_simulator_interface_c::[sg]et_enabled() methods
- in siminterface.cc, move a few bx_real_sim_c methods to where they belong,
  with the rest of the methods.  No changes to the actual methods.
- remove some DOS ^M's which crept in and confused my editor.
2002-08-26 15:31:23 +00:00
Christophe Bothamy
65b715a6ed - fixed test for NE2K_OBJ 2002-08-22 22:21:19 +00:00
Christophe Bothamy
099dad0041 - updated with patch from brad@openbsd.org. See bug [ 593340 ]. 2002-08-11 11:42:09 +00:00
Christophe Bothamy
bc6d07a2c9 - generated from configure.in r1.83 2002-07-16 12:10:05 +00:00
Christophe Bothamy
0fc3304a35 - cdrom is enabled by default
- added a --enable-fetchdecode-cache option
2002-06-06 15:42:11 +00:00
Bryce Denney
2f69a74616 - commit TUN/TAP patch, though I can't really test it. I can verify that if
you don't have if_tun.h the configure script does not enable TUN/TAP.
2002-04-18 00:59:20 +00:00
Bryce Denney
30aaf4088e - commit patch.wxwindows.gz in the main branch. Now you can try out
the wxwindows interface by just "configure --with-wx; make"

  Modified Files:
    Makefile.in bochs.h config.h.in configure configure.in
    load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h
    debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc
    gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc
    iodev/keyboard.cc memory/misc_mem.cc
  Added Files:
    README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc
    gui/wxmain.h gui/bitmaps/cdromd.xpm
    gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm
    gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm
    gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm
    gui/bitmaps/power.xpm gui/bitmaps/reset.xpm
    gui/bitmaps/snapshot.xpm
  Removed Files:
    patches/patch.wxwindows.gz
2002-04-18 00:22:20 +00:00
Bryce Denney
45b49fe35f - this patch from William Lee Irwin III <wli@holomorphy.com> makes it easy to
configure and compile a BIOS for 8 CPUs.
2002-04-08 01:41:59 +00:00
Bryce Denney
8983937e5c - in main branch, change version name back to "1.4.cvs" so that it's not
confused with any release.
2002-03-28 09:43:07 +00:00
Bryce Denney
715becded5 - upgrade version number to 1.4 2002-03-28 01:20:31 +00:00
Bryce Denney
2a63f9d737 - in rev 1.73 enabled the I/O debugger by default when the debugger is on.
But I left out a critical line, that added iodebug.o to the compile list.
  This rev adds it in so that --enable-debugger will actually compile.
2002-03-26 12:47:50 +00:00
Bryce Denney
6347533913 - Fixes bug #534760: buggy detection of ethertap header. 2002-03-26 05:59:12 +00:00
Bryce Denney
5ab4415516 - enable I/O interface to debugger, when the debugger is enabled 2002-03-21 02:14:51 +00:00
Bryce Denney
e73971ba66 - update version number 2002-03-11 17:15:21 +00:00
Bryce Denney
417425b2e8 - when compiling with --with-sdl, add config-sdl --cflags to the
CFLAGS.  This is needed on systems in which the SDL headers are in
  a nonstandard location.
2002-03-10 21:31:52 +00:00
Bryce Denney
9a177ba518 - add configure test for ethertap. On systems which have a header file
called <linux/netlink.h> the ethertap module will be defined.  If other
  OSes turn up that also have ethertap, we can change the test.
- in eth_tap.cc, I replaced the calls to GPL code from maconlinux with
  my own stuff.
2002-03-09 01:04:49 +00:00
Bryce Denney
c2e0e409e7 - add --enable-vbe option in anticipation of Jereon Jannsen's VESA BIOS
extensions.
2002-03-08 22:37:06 +00:00
Bryce Denney
bef9401a16 - fix the check for socklen_t. It is never defined unless you include
sys/socket.h, duh.
2002-03-08 05:45:51 +00:00
Bryce Denney
9b03cd05e5 - update 2002-03-08 04:47:59 +00:00
Bryce Denney
41767f5a5f - add configure check for socklen_t, define as int if not already there. 2002-03-08 04:45:00 +00:00
Bryce Denney
556a8fa8f8 - commit patch.check-platform. For full details, pull up the patch itself
and look at the description at the top.  Here's an intro.

  This patch makes significant changes to the configure script.  It adds the
  lines AC_CANONICAL_HOST and AC_CANONICAL_TARGET which detect the OS and
  processor type.  The configure script, knowing the OS and processor type, can
  then make intelligent decisions about which CFLAGS are needed and what is the
  default GUI for that platform.  One of the goals of this patch is to make it
  so that on all supported platforms, "configure;make" will compile cleanly.
  Configure detects the target platform, but it can be overridden by using
  --target=___.  This is important when using one platform to generate
  Makefiles and header files for another platform.  See config.guess script for
  the exact details of platform naming.

  The defaults that are currently implemented in the modified configure script
  include:
    If platform is windows* or winnt*, use win32 gui.
    If platform is cygwin*, use win32 gui and compile with
       "-mno-cygwin -DWIN32".
    If platform is macosx* or darwin*, use carbon gui and compile
       with "-fpascal-strings -fno-common -arch ppc -Wno-four-char-constants
       -Wno-unknown-pragmas -Dmacintosh"
    If platform is macos, use macos gui.
    If platform is beos, use beos gui.
    If platform is amigaos, use amigaos gui.
    Otherwise, use X windows gui.
2002-03-07 16:00:39 +00:00
Bryce Denney
17e5bfc00b - change version number to 1.4.pre1 to make a snapshot 2002-03-05 15:58:59 +00:00
instinc
4be53d635a Added --with-sdl 2002-02-05 19:21:59 +00:00
Bryce Denney
d7ea373b90 - apparantly freebsd works with linux sound code. Now you can type
configure --enable-sb16=freebsd and it works according to
   Jeroen Ruigrok/asmodai <asmodai@wxs.nl>
2002-01-16 19:52:28 +00:00
Volker Ruppert
7a7bd0779f - version number updated 2002-01-08 18:58:47 +00:00
Bryce Denney
e8bcb173e5 - detect when MacOS X cdrom code can be used: when the header file
"IOKit/storage/IOCDMedia.h" is available.
2001-12-07 22:18:40 +00:00
Bryce Denney
706f0629f8 - Bernd's configure seems to want both cdrom.o and cdrom_beos.o, though I'm
not sure it's required.
2001-12-07 18:51:29 +00:00
Bryce Denney
5fcb69ca3a - to allow configure to be run from other directories, I added some
mkdirs for build and build/linux.  This was working, but then broke
  when I made configure substitute the version number in lots of new
  files.
2001-12-05 16:46:00 +00:00
Bryce Denney
2cd62e75c8 - Dave enabled the E9 hack in config.h.in, but it had no effect. The correct
way is to make the configure.in default to turning it on.  The value in
  config.h.in will be replaced by configure anyway.
2001-12-05 16:25:24 +00:00
Bryce Denney
0bbe088d56 - add beos cdrom .o file, when beos and cdrom are selected. I don't
have the actual cdrom_beos.cc file yet from Bernd.
2001-12-05 03:37:08 +00:00
Bryce Denney
50f84e5947 - add configure switch called --enable-idle-hack that turns on
Roland Mainz's idle patch.
2001-11-12 00:43:59 +00:00
Bryce Denney
7c92e20272 - add test for getenv 2001-11-11 05:43:12 +00:00
Bryce Denney
473e3f1c88 - I have tried to make the --prefix argument to configure control
everything about the installation path.  There should be no more
  hardcoded references to /usr/local/bochs.  Instead, there are
  references to @prefix@ which get replaced by the configure script
  with the real prefix.
2001-11-10 03:48:22 +00:00
Bryce Denney
70069a4ad8 - also compile niclist when NE2000 is enabled 2001-10-09 13:41:01 +00:00