Author: eliot Date: 2011-11-12 13:10:06 -0800 (Sat, 12 Nov 2011) New Revision: 2510

Added: branches/Cog/processors/IA32/bochs/README.COG branches/Cog/processors/IA32/bochs/exploration/Makefile branches/Cog/processors/IA32/linuxbochs/ branches/Cog/processors/IA32/linuxbochs/conf.COG branches/Cog/processors/IA32/macbochs/ branches/Cog/processors/IA32/macbochs/conf.COG branches/Cog/processors/IA32/winbochs/ branches/Cog/processors/IA32/winbochs/conf.COG Removed: branches/Cog/processors/IA32/bochs/conf.COG branches/Cog/processors/IA32/bochs/config.h Modified: branches/Cog/cygwinbuild/plugins.ext branches/Cog/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj branches/Cog/processors/IA32/bochs/exploration/printcpu.c branches/Cog/processors/IA32/bochs/exploration/printcpucr.c branches/Cog/processors/IA32/bochs/exploration/printcpuxmm.c Log: Add separate build directories to bochs library to enable building BochsIA32Plugin on multiple platforms. Add external BochsIA32Plugin on win32.

Modified: branches/Cog/cygwinbuild/plugins.ext =================================================================== --- branches/Cog/cygwinbuild/plugins.ext 2011-11-10 02:11:13 UTC (rev 2509) +++ branches/Cog/cygwinbuild/plugins.ext 2011-11-12 21:10:06 UTC (rev 2510) @@ -1,5 +1,6 @@ # List of external plugins. EXTERNAL_PLUGINS = \ +BochsIA32Plugin \ SqueakFFIPrims \ Win32OSProcessPlugin

Modified: branches/Cog/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj 2011-11-10 02:11:13 UTC (rev 2509) +++ branches/Cog/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj 2011-11-12 21:10:06 UTC (rev 2510) @@ -19,10 +19,10 @@ 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; 73020E8C0EE714E60021D217 /* BochsIA32Plugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = BochsIA32Plugin.c; path = ../../src/plugins/BochsIA32Plugin/BochsIA32Plugin.c; sourceTree = SOURCE_ROOT; }; 73020E8E0EE7158C0021D217 /* BochsIA32Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BochsIA32Plugin.h; path = ../../platforms/Cross/plugins/BochsIA32Plugin/BochsIA32Plugin.h; sourceTree = SOURCE_ROOT; }; - 737482B20EE7339F004E10F8 /* libcpu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcpu.a; path = ../../processors/IA32/bochs/cpu/libcpu.a; sourceTree = SOURCE_ROOT; }; - 737482B40EE733BD004E10F8 /* libfpu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfpu.a; path = ../../processors/IA32/bochs/fpu/libfpu.a; sourceTree = SOURCE_ROOT; }; + 737482B20EE7339F004E10F8 /* libcpu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcpu.a; path = ../../processors/IA32/macbochs/cpu/libcpu.a; sourceTree = SOURCE_ROOT; }; + 737482B40EE733BD004E10F8 /* libfpu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfpu.a; path = ../../processors/IA32/macbochs/fpu/libfpu.a; sourceTree = SOURCE_ROOT; }; 737482B60EE7343B004E10F8 /* sqBochsIA32Plugin.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = sqBochsIA32Plugin.cpp; path = ../../platforms/Cross/plugins/BochsIA32Plugin/sqBochsIA32Plugin.cpp; sourceTree = SOURCE_ROOT; }; - 737483070EE7406A004E10F8 /* libdisasm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdisasm.a; path = ../../processors/IA32/bochs/disasm/libdisasm.a; sourceTree = SOURCE_ROOT; }; + 737483070EE7406A004E10F8 /* libdisasm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdisasm.a; path = ../../processors/IA32/macbochs/disasm/libdisasm.a; sourceTree = SOURCE_ROOT; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D01CCD20486CAD60068D4B7 /* BochsIA32Plugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BochsIA32Plugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../src/vm/interp.h; sourceTree = SOURCE_ROOT; }; @@ -178,14 +178,10 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", ); - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = ""$(SRCROOT)/../../processors/IA32/bochs/cpu""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = ""$(SRCROOT)/../../processors/IA32/bochs/fpu""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = ""$(SRCROOT)/../../processors/IA32/bochs/disasm""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = ""$(SRCROOT)/../../processors/IA32/bochs/gui""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = ""$(SRCROOT)/../../processors/IA32/bochs/gui""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = ""$(SRCROOT)/../../processors/IA32/macbochs/cpu""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = ""$(SRCROOT)/../../processors/IA32/macbochs/fpu""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = ""$(SRCROOT)/../../processors/IA32/macbochs/disasm""; PRODUCT_NAME = BochsIA32Plugin; WRAPPER_EXTENSION = bundle; ZERO_LINK = YES; @@ -205,14 +201,10 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", ); - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = ""$(SRCROOT)/../../processors/IA32/bochs/cpu""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = ""$(SRCROOT)/../../processors/IA32/bochs/fpu""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = ""$(SRCROOT)/../../processors/IA32/bochs/disasm""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = ""$(SRCROOT)/../../processors/IA32/bochs/gui""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = ""$(SRCROOT)/../../processors/IA32/bochs/gui""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = ""$(SRCROOT)/../../processors/IA32/macbochs/cpu""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = ""$(SRCROOT)/../../processors/IA32/macbochs/fpu""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = ""$(SRCROOT)/../../processors/IA32/macbochs/disasm""; PRODUCT_NAME = BochsIA32Plugin; WRAPPER_EXTENSION = bundle; };

Added: branches/Cog/processors/IA32/bochs/README.COG =================================================================== --- branches/Cog/processors/IA32/bochs/README.COG (rev 0) +++ branches/Cog/processors/IA32/bochs/README.COG 2011-11-12 21:10:06 UTC (rev 2510) @@ -0,0 +1,3 @@ +Guide to build Bochs support librarires libcpu.a libfpu.a & libdisasm.a for Cog. +Go to the sibling directory for your platform (../macbochs, ../winbochs etc) +and read and then run conf.COG there-in. Then run ../bochs/makeem there-in.

Deleted: branches/Cog/processors/IA32/bochs/conf.COG =================================================================== --- branches/Cog/processors/IA32/bochs/conf.COG 2011-11-10 02:11:13 UTC (rev 2509) +++ branches/Cog/processors/IA32/bochs/conf.COG 2011-11-12 21:10:06 UTC (rev 2510) @@ -1,48 +0,0 @@ -#!/bin/sh - -# this sets up the compile for Cog. Disable as much inessential stuff -# as possible leaving only the cpu/fpu & memory interface - -# build using -# $ ./conf.COG -# $ ./makeem - -set echo -# CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-labels=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -fprefetch-loop-arrays $CFLAGS" -CFLAGS="-m32 $CFLAGS" -CFLAGS="-Dlongjmp=_longjmp -Dsetjmp=_setjmp $CFLAGS" -CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions $CFLAGS" -CFLAGS="-g $CFLAGS" -CPPFLAGS="" -CXXFLAGS="$CFLAGS" - -export CFLAGS -export CPATH -export CPPFLAGS -export CXXFLAGS -export LDFLAGS - -./configure --enable-Cog \ - --enable-cpu-level=6 \ - --enable-sse=2 \ - --enable-assert-checks \ - --with-nogui \ - --disable-x86-64 \ - --disable-pae \ - --disable-large-pages \ - --disable-global-pages \ - --disable-mtrr \ - --disable-sb16 \ - --disable-ne2000 \ - --disable-pci \ - --disable-acpi \ - --disable-apic \ - --disable-clgd54xx \ - --disable-usb \ - --disable-plugins \ - ${CONFIGURE_ARGS} - -# apic == Advanced programmable Interrupt Controller -# acpi == Advanced Configuration and Power Interface -# pci == Peripheral Component Interconnect local bus -# clgd54xx == Cirrus Logic GD54xx video card

Deleted: branches/Cog/processors/IA32/bochs/config.h =================================================================== --- branches/Cog/processors/IA32/bochs/config.h 2011-11-10 02:11:13 UTC (rev 2509) +++ branches/Cog/processors/IA32/bochs/config.h 2011-11-12 21:10:06 UTC (rev 2510) @@ -1,979 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ -// Copyright (C) 2001 MandrakeSoft S.A. -// -// MandrakeSoft S.A. -// 43, rue d'Aboukir -// 75002 Paris - France -// http://www.linux-mandrake.com/ -// http://www.mandrakesoft.com/ -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -// -// config.h.in is distributed in the source TAR file. When you run -// the configure script, it generates config.h with some changes -// according to your build environment. For example, in config.h.in, -// SIZEOF_UNSIGNED_CHAR is set to 0. When configure produces config.h -// it will change "0" to the detected value for your system. -// -// config.h contains ONLY preprocessor #defines and a few typedefs. -// It must be included by both C and C++ files, so it must not -// contain anything language dependent such as a class declaration. -// - -#ifndef _BX_CONFIG_H_ -#define _BX_CONFIG_H_ 1 - -/////////////////////////////////////////////////////////////////// -// USER CONFIGURABLE OPTIONS : EDIT ONLY OPTIONS IN THIS SECTION // -/////////////////////////////////////////////////////////////////// - - -#if 1 -// quit_sim is defined in gui/siminterface.h -#define BX_EXIT(x) SIM->quit_sim (x) -#else -// provide the real main and the usual exit. -#define BX_EXIT(x) ::exit(x) -#endif - -// We have tested the following combinations: -// * processors=1, bootstrap=0, ioapic_id=1 (uniprocessor system) -// * processors=2, bootstrap=0, ioapic_id=2 -// * processors=4, bootstrap=0, ioapic_id=4 -#define BX_SUPPORT_SMP 0 -#define BX_BOOTSTRAP_PROCESSOR 0 -#define BX_MAX_SMP_THREADS_SUPPORTED 8 - -// include in APIC models, required for a multiprocessor system. -#define BX_SUPPORT_APIC 0 - -#if (BX_SUPPORT_SMP && !BX_SUPPORT_APIC) -#error For multiprocessor simulation, BX_SUPPORT_APIC is required. -#endif - -// if simulating Linux, this provides a few more debugging options -// such as tracing all system calls. -#define BX_DEBUG_LINUX 0 - -// adds support for the GNU readline library in the debugger command -// prompt. -#define HAVE_LIBREADLINE 0 -#define HAVE_READLINE_HISTORY_H 1 - -// Define to 1 if you have <locale.h> -#define HAVE_LOCALE_H 0 - -// I rebuilt the code which provides timers to IO devices. -// Setting this to 1 will introduce a little code which -// will panic out if cases which shouldn't happen occur. -// Set this to 0 for optimal performance. -#define BX_TIMER_DEBUG 0 - -// Settable A20 line. For efficiency, you can disable -// having a settable A20 line, eliminating conditional -// code for every physical memory access. You'll have -// to tell your software not to mess with the A20 line, -// and accept it as always being on if you change this. -// 1 = use settable A20 line. (normal) -// 0 = A20 is like the rest of the address lines - -#define BX_SUPPORT_A20 1 - -// Processor Instructions Per Second -// To find out what value to use for the 'ips' directive -// in your '.bochsrc' file, set BX_SHOW_IPS to 1, and -// run the software in bochs you plan to use most. Bochs -// will print out periodic IPS ratings. This will change -// based on the processor mode at the time, and various -// other factors. You'll get a reasonable estimate though. -// When you're done, reset BX_SHOW_IPS to 0, do a -// 'make all-clean', then 'make' again. - -#define BX_SHOW_IPS 0 - - -#if (BX_SHOW_IPS) && (defined(__MINGW32__) || defined(_MSC_VER)) -#define SIGALRM 14 -#endif - -// Compile in support for DMA & FLOPPY IO. You'll need this -// if you plan to use the floppy drive emulation. But if -// you're environment doesn't require it, you can change -// it to 0. - -#define BX_DMA_FLOPPY_IO 1 - -// Default number of Megs of memory to emulate. The -// 'megs:' directive in the '.bochsrc' file overrides this, -// allowing per-run settings. - -#define BX_DEFAULT_MEM_MEGS 32 - -// CPU level emulation. Default level is set in -// the configure script. BX_CPU_LEVEL defines the CPU level -// to emulate. BX_CPU_LEVEL_HACKED is a hack to define the -// level of some instructions, so they can be tested before -// the rest of the emulation is up to that level. - -#define BX_CPU_LEVEL 6 -#define BX_CPU_LEVEL_HACKED 6 - -// emulate x86-64 instruction set? -#define BX_SUPPORT_X86_64 0 - -// emulate long physical address (>32 bit) -#define BX_PHY_ADDRESS_LONG 0 - -#define BX_HAVE_SLEEP 1 -#define BX_HAVE_MSLEEP 0 -#define BX_HAVE_USLEEP 1 -#define BX_HAVE_NANOSLEEP 1 -#define BX_HAVE_ABORT 1 -#define BX_HAVE_SOCKLEN_T 1 -#define BX_HAVE_SOCKADDR_IN_SIN_LEN 1 -#define BX_HAVE_GETTIMEOFDAY 1 -#if defined(WIN32) -#define BX_HAVE_REALTIME_USEC 1 -#else -#define BX_HAVE_REALTIME_USEC (BX_HAVE_GETTIMEOFDAY) -#endif -#define BX_HAVE_MKSTEMP 1 -#define BX_HAVE_SYS_MMAN_H 1 -#define BX_HAVE_XPM_H 0 -#define BX_HAVE_TIMELOCAL 1 -#define BX_HAVE_GMTIME 1 -#define BX_HAVE_MKTIME 1 -#define BX_HAVE_NET_IF_H 0 - -// This turns on Roland Mainz's idle hack. Presently it is specific to the X11 -// and term gui. If people try to enable it elsewhere, give a compile error -// after the gui definition so that they don't waste their time trying. -#define BX_USE_IDLE_HACK 0 - -// Minimum Emulated IPS. -// This is used in the realtime PIT as well as for checking the -// IPS value set in the config file. -#define BX_MIN_IPS 200000 - -// Minimum and maximum values for SMP quantum variable. Defines -// how many instructions each CPU could execute execute in one -// shot (one cpu_loop call) -#define BX_SMP_QUANTUM_MIN 1 -#define BX_SMP_QUANTUM_MAX 16 - -// Use Static Member Funtions to eliminate 'this' pointer passing -// If you want the efficiency of 'C', you can make all the -// members of the C++ CPU class to be static. -// This defaults to 1 since it should improve performance, but when -// SMP mode is enabled, it will be turned off by configure. -#define BX_USE_CPU_SMF 1 - -#define BX_USE_MEM_SMF 1 - -// Use static member functions in IO DEVice emulation modules. -// For efficiency, use C like functions for IO handling, -// and declare a device instance at compile time, -// instead of using 'new' and storing the pointer. This -// eliminates some overhead, especially for high-use IO -// devices like the disk drive. -// 1 = Use static member efficiency (normal) -// 0 = Use nonstatic member functions (use only if you need -// multiple instances of a device class - -#define BX_USE_HD_SMF 1 // Hard drive -#define BX_USE_BIOS_SMF 1 // BIOS -#define BX_USE_CMOS_SMF 1 // CMOS -#define BX_USE_DMA_SMF 1 // DMA -#define BX_USE_FD_SMF 1 // Floppy -#define BX_USE_KEY_SMF 1 // Keyboard -#define BX_USE_PAR_SMF 1 // Parallel -#define BX_USE_PIC_SMF 1 // PIC -#define BX_USE_PIT_SMF 1 // PIT -#define BX_USE_SER_SMF 1 // Serial -#define BX_USE_UM_SMF 1 // Unmapped -#define BX_USE_VGA_SMF 1 // VGA -#define BX_USE_SB16_SMF 1 // Sound (SB 16) -#define BX_USE_DEV_SMF 1 // System Devices (port92) -#define BX_USE_PCI_SMF 1 // PCI -#define BX_USE_P2I_SMF 1 // PCI-to-ISA bridge -#define BX_USE_PIDE_SMF 1 // PCI-IDE -#define BX_USE_PCIVGA_SMF 1 // PCI-VGA -#define BX_USE_PCIDEV_SMF 1 // PCI-DEV -#define BX_USE_PCIUSB_SMF 1 // USB hub -#define BX_USE_PCIPNIC_SMF 1 // PCI pseudo NIC -#define BX_USE_NE2K_SMF 1 // NE2K -#define BX_USE_EFI_SMF 1 // External FPU IRQ -#define BX_USE_GAMEPORT_SMF 1 // Gameport -#define BX_USE_CIRRUS_SMF 1 // SVGA Cirrus -#define BX_USE_BUSM_SMF 1 // Bus Mouse -#define BX_USE_ACPI_SMF 1 // ACPI - -#define BX_PLUGINS 0 -#define BX_HAVE_DLFCN_H 1 - -#if BX_PLUGINS && \ - ( !BX_USE_HD_SMF || !BX_USE_BIOS_SMF || !BX_USE_CMOS_SMF \ - || !BX_USE_DMA_SMF || !BX_USE_FD_SMF || !BX_USE_KEY_SMF \ - || !BX_USE_PAR_SMF || !BX_USE_PIC_SMF || !BX_USE_PIT_SMF \ - || !BX_USE_SER_SMF || !BX_USE_UM_SMF || !BX_USE_VGA_SMF \ - || !BX_USE_SB16_SMF || !BX_USE_DEV_SMF || !BX_USE_PCI_SMF \ - || !BX_USE_P2I_SMF || !BX_USE_PCIVGA_SMF || !BX_USE_PCIUSB_SMF \ - || !BX_USE_PCIPNIC_SMF || !BX_USE_PIDE_SMF || !BX_USE_ACPI_SMF \ - || !BX_USE_NE2K_SMF || !BX_USE_EFI_SMF || !BX_USE_GAMEPORT_SMF \ - || !BX_USE_PCIDEV_SMF || !BX_USE_CIRRUS_SMF) -#error You must use SMF to have plugins -#endif - -#define BX_SUPPORT_SB16 0 -#define BX_SUPPORT_GAMEPORT 0 - -#if BX_SUPPORT_SB16 -// Use virtual methods for the sound output functions -#define BX_USE_SOUND_VIRTUAL 1 -// Determines which sound output class is to be used. -// Currently the following are available: -// bx_sound_linux_c Output for Linux, to /dev/dsp and /dev/midi00 -// bx_sound_windows_c Output for Windows midi and wave mappers -// bx_sound_output_c Dummy functions, no output -#define BX_SOUND_OUTPUT_C bx_sound_output_c -// Use ALSA sound interface on Linux -#define BX_HAVE_ALSASOUND 0 -#endif - -#define USE_RAW_SERIAL 0 - -// This enables writing to port 0xe9 and the output -// is sent to the console. Reading from port 0xe9 -// will return 0xe9 to let you know this is available. -// Leave this 0 unless you have a reason to use it. -#define BX_PORT_E9_HACK 1 - -#define BX_GDBSTUB 0 - -// This option enables compressed (zlib) hd support -#define BX_COMPRESSED_HD_SUPPORT 0 -#define BX_HAVE_ZLIB 1 - -#if BX_COMPRESSED_HD_SUPPORT && !BX_HAVE_ZLIB -#error You must have zlib to enable compressed hd support -#endif - -// This option defines the number of supported ATA channels. -// There are up to two drives per ATA channel. -#define BX_MAX_ATA_CHANNEL 4 - -#if (BX_MAX_ATA_CHANNEL>4 || BX_MAX_ATA_CHANNEL<1) -# error "BX_MAX_ATA_CHANNEL should be between 1 and 4" -#endif - -// ================================================================= -// BEGIN: OPTIONAL DEBUGGER SECTION -// -// These options are only used if you compile in support for the -// native command line debugging environment. Typically, the debugger -// is not used, and this section can be ignored. -// ================================================================= - -// Compile in support for virtual/linear/physical breakpoints. -// Enable only those you need. Recommend using only linear -// breakpoints, unless you need others. Less supported means -// slightly faster execution time. -#define BX_DBG_MAX_VIR_BPOINTS 16 -#define BX_DBG_MAX_LIN_BPOINTS 16 -#define BX_DBG_MAX_PHY_BPOINTS 16 - -#define BX_DBG_MAX_WATCHPONTS 16 - -// max file pathname size for debugger commands -#define BX_MAX_PATH 256 -// max nesting level for debug scripts including other scripts -#define BX_INFILE_DEPTH 10 -// use this command to include (nest) debug scripts -#define BX_INCLUDE_CMD "source" - -// Make a call to command line debugger extensions. If set to 1, -// a call is made. An external routine has a chance to process -// the command. If it does, than the debugger ignores the command. -#define BX_DBG_EXTENSIONS 0 - -// ================================================================= -// END: OPTIONAL DEBUGGER SECTION -// ================================================================= - -////////////////////////////////////////////////////////////////////// -// END OF USER CONFIGURABLE OPTIONS : DON'T EDIT ANYTHING BELOW !!! // -// THIS IS GENERATED BY THE ./configure SCRIPT // -////////////////////////////////////////////////////////////////////// - - -#define BX_WITH_X11 0 -#define BX_WITH_BEOS 0 -#define BX_WITH_WIN32 0 -#define BX_WITH_MACOS 0 -#define BX_WITH_CARBON 0 -#define BX_WITH_NOGUI 1 -#define BX_WITH_TERM 0 -#define BX_WITH_RFB 0 -#define BX_WITH_AMIGAOS 0 -#define BX_WITH_SDL 0 -#define BX_WITH_SVGA 0 -#define BX_WITH_WX 0 - -// BX_USE_TEXTCONFIG should be set to 1 unless Bochs is compiled -// for wxWidgets only. -#define BX_USE_TEXTCONFIG 1 - -// A certain functions must NOT be fastcall even if compiled with fastcall -// option, and those are callbacks from Windows which are defined either -// as cdecl or stdcall. The entry point main() also has to remain cdecl. -#ifndef CDECL -#if defined(_MSC_VER) - #define CDECL __cdecl -#else - #define CDECL -#endif -#endif - -// add special export symbols for win32 DLL building. The main code must -// have __declspec(dllexport) on variables, functions, or classes that the -// plugins can access. The plugins should #define PLUGGABLE which will -// activate the __declspec(dllimport) instead. -#if defined(WIN32) || defined(__CYGWIN__) -# if BX_PLUGINS && defined(BX_PLUGGABLE) -// #warning I will import DLL symbols from Bochs main program. -# define BOCHSAPI __declspec(dllimport) -# elif BX_PLUGINS -// #warning I will export DLL symbols. -# define BOCHSAPI __declspec(dllexport) -# endif -#endif -#ifndef BOCHSAPI -# define BOCHSAPI -#endif - -#if defined(__CYGWIN__) -// Make BOCHSAPI_CYGONLY exactly the same as BOCHSAPI. This symbol -// will be used for any cases where Cygwin requires a special tag -// but VC++ does not. -#define BOCHSAPI_CYGONLY BOCHSAPI -#else -// define the symbol to be empty -#define BOCHSAPI_CYGONLY /*empty*/ -#endif - -#if defined(_MSC_VER) -// Make BOCHSAPI_MSVCONLY exactly the same as BOCHSAPI. This symbol -// will be used for any cases where VC++ requires a special tag -// but Cygwin does not. -#define BOCHSAPI_MSVCONLY BOCHSAPI -#else -// define the symbol to be empty -#define BOCHSAPI_MSVCONLY /*empty*/ -#endif - -#define BX_DEFAULT_CONFIG_INTERFACE "defined_by_configure" -#define BX_DEFAULT_DISPLAY_LIBRARY "defined_by_configure" - -// Roland Mainz's idle hack is presently specific to X11. If people try to -// enable it elsewhere, give a compile error so that they don't waste their -// time trying. -#if (BX_USE_IDLE_HACK && !BX_WITH_X11 && !BX_WITH_TERM) -# error IDLE_HACK will only work with the X11 or term gui. Correct configure args and retry. -#endif - -#define WORDS_BIGENDIAN 0 - -#define SIZEOF_UNSIGNED_CHAR 1 -#define SIZEOF_UNSIGNED_SHORT 2 -#define SIZEOF_UNSIGNED_INT 4 -#define SIZEOF_UNSIGNED_LONG 4 -#define SIZEOF_UNSIGNED_LONG_LONG 8 -#define SIZEOF_INT_P 4 - -#define BX_64BIT_CONSTANTS_USE_LL 1 -#if BX_64BIT_CONSTANTS_USE_LL -// doesn't work on Microsoft Visual C++, maybe others -#define BX_CONST64(x) (x##LL) -#elif defined(_MSC_VER) -#define BX_CONST64(x) (x##I64) -#else -#define BX_CONST64(x) (x) -#endif - -#if defined(WIN32) - typedef unsigned char Bit8u; - typedef signed char Bit8s; - typedef unsigned short Bit16u; - typedef signed short Bit16s; - typedef unsigned int Bit32u; - typedef signed int Bit32s; -#ifdef __MINGW32__ - typedef unsigned long long Bit64u; - typedef signed long long Bit64s; -#include <sys/types.h> -#else - typedef unsigned __int64 Bit64u; - typedef signed __int64 Bit64s; -#endif -#elif BX_WITH_MACOS - typedef unsigned char Bit8u; - typedef signed char Bit8s; - typedef unsigned short Bit16u; - typedef signed short Bit16s; - typedef unsigned int Bit32u; - typedef signed int Bit32s; - typedef unsigned long long Bit64u; - typedef signed long long Bit64s; -#else - -// Unix like platforms - -#if SIZEOF_UNSIGNED_CHAR != 1 -# error "sizeof (unsigned char) != 1" -#else - typedef unsigned char Bit8u; - typedef signed char Bit8s; -#endif - -#if SIZEOF_UNSIGNED_SHORT != 2 -# error "sizeof (unsigned short) != 2" -#else - typedef unsigned short Bit16u; - typedef signed short Bit16s; -#endif - -#if SIZEOF_UNSIGNED_INT == 4 - typedef unsigned int Bit32u; - typedef signed int Bit32s; -#elif SIZEOF_UNSIGNED_LONG == 4 - typedef unsigned long Bit32u; - typedef signed long Bit32s; -#else -# error "can't find sizeof(type) of 4 bytes!" -#endif - -#if SIZEOF_UNSIGNED_LONG == 8 - typedef unsigned long Bit64u; - typedef signed long Bit64s; -#elif SIZEOF_UNSIGNED_LONG_LONG == 8 - typedef unsigned long long Bit64u; - typedef signed long long Bit64s; -#else -# error "can't find data type of 8 bytes" -#endif - -#endif - -#define GET32L(val64) ((Bit32u)(((Bit64u)(val64)) & 0xFFFFFFFF)) -#define GET32H(val64) ((Bit32u)(((Bit64u)(val64)) >> 32)) - -// now that Bit32u and Bit64u exist, defined bx_address -#if BX_SUPPORT_X86_64 -typedef Bit64u bx_address; -#else -typedef Bit32u bx_address; -#endif - -// define physical and linear address types -typedef bx_address bx_lin_address; - -#if BX_SUPPORT_X86_64 -#define BX_LIN_ADDRESS_WIDTH 48 -#else -#define BX_LIN_ADDRESS_WIDTH 32 -#endif - -#if BX_PHY_ADDRESS_LONG -typedef Bit64u bx_phy_address; -#define BX_PHY_ADDRESS_WIDTH 40 -#else -typedef Bit32u bx_phy_address; -#define BX_PHY_ADDRESS_WIDTH 32 -#endif - -// technically, in an 8 bit signed the real minimum is -128, not -127. -// But if you decide to negate -128 you tend to get -128 again, so it's -// better not to use the absolute maximum in the signed range. -#define BX_MAX_BIT64U ( (Bit64u) -1 ) -#define BX_MIN_BIT64U ( 0 ) -#define BX_MAX_BIT64S ( ((Bit64u) -1) >> 1 ) -#define BX_MIN_BIT64S ( (Bit64s)-(((Bit64u) -1) >> 1) ) -#define BX_MAX_BIT32U ( (Bit32u) -1 ) -#define BX_MIN_BIT32U ( 0 ) -#define BX_MAX_BIT32S ( ((Bit32u) -1) >> 1 ) -#define BX_MIN_BIT32S ( (Bit32s)-(((Bit32u) -1) >> 1) ) -#define BX_MAX_BIT16U ( (Bit16u) -1 ) -#define BX_MIN_BIT16U ( 0 ) -#define BX_MAX_BIT16S ( ((Bit16u) -1) >> 1 ) -#define BX_MIN_BIT16S ( (Bit16s)-(((Bit16u) -1) >> 1) ) -#define BX_MAX_BIT8U ( (Bit8u) -1 ) -#define BX_MIN_BIT8U ( 0 ) -#define BX_MAX_BIT8S ( ((Bit8u) -1) >> 1 ) -#define BX_MIN_BIT8S ( (Bit8s)-(((Bit8u) -1) >> 1) ) - - -// create an unsigned integer type that is the same size as a pointer. -// You can typecast a pointer to a bx_pr_equiv_t without losing any -// bits (and without getting the compiler excited). This is used in -// the FPU emulation code, where pointers and integers are often -// used interchangeably. -#if SIZEOF_INT_P == 4 - typedef Bit32u bx_ptr_equiv_t; -#elif SIZEOF_INT_P == 8 - typedef Bit64u bx_ptr_equiv_t; -#else -# error "could not define bx_ptr_equiv_t to size of int*" -#endif - -// Use a boolean type that will not conflict with the builtin type -// on any system. -typedef Bit32u bx_bool; - -#if BX_WITH_MACOS -# define bx_ptr_t char * -#else -# define bx_ptr_t void * -#endif - -#if defined(WIN32) -# define BX_LITTLE_ENDIAN -#elif BX_WITH_MACOS -# define BX_BIG_ENDIAN -#else -#if WORDS_BIGENDIAN -# define BX_BIG_ENDIAN -#else -# define BX_LITTLE_ENDIAN -#endif -#endif // defined(WIN32) - - -#if BX_SUPPORT_X86_64 -#ifdef BX_LITTLE_ENDIAN -typedef - struct { - Bit64u lo; - Bit64u hi; - } Bit128u; -typedef - struct { - Bit64u lo; - Bit64s hi; - } Bit128s; -#else // must be Big Endian -typedef - struct { - Bit64u hi; - Bit64u lo; - } Bit128u; -typedef - struct { - Bit64s hi; - Bit64u lo; - } Bit128s; -#endif -#endif // #if BX_SUPPORT_X86_64 - - -// for now only term.cc requires a GUI sighandler. -#define BX_GUI_SIGHANDLER (BX_WITH_TERM) - -#define HAVE_SIGACTION 1 - -// configure will change the definition of "inline" to the value -// that the C compiler allows. It tests the following keywords to -// see if any is permitted: inline, __inline__, __inline. If none -// is permitted, it defines inline to be empty. -#define inline inline - -// inline functions in headers that are compiled with C compiler -// (e.g. fpu code) are declared with BX_C_INLINE macro. Note that -// the word "inline" itself may now be redefined by the above #define. -// Many compilers are known to work with "static inline". If the -// compiler can put the function inline, it does so and never creates -// a symbol for the function. If optimization is off, or inline is -// defined to be empty, the static keyword causes the function to create -// a symbol that's visible only to that .c file. Each .c file that -// includes the header will produce another local version of the -// BX_C_INLINE function (not ideal). However without "static" you can -// duplicate symbol problems which are even worse. -#define BX_C_INLINE static inline - -// Use BX_CPP_INLINE for all C++ inline functions. Note that the -// word "inline" itself may now be redefined by the above #define. -#define BX_CPP_INLINE inline - -#ifdef __GNUC__ - -// Some helpful compiler hints for compilers that allow them; GCC for now. -// -// BX_CPP_AlignN(n): -// Align a construct on an n-byte boundary. -// -// BX_CPP_AttrPrintf(formatArg, firstArg): -// This function takes printf-like arguments, so the compiler can check -// the consistency of the format string and the matching arguments. -// 'formatArg' is the parameter number (starting from 1) of the format -// string argument. 'firstArg' is the parameter number of the 1st argument -// to check against the string argument. NOTE: For non-static member -// functions, the this-ptr is argument number 1 but is invisible on -// the function prototype declaration - but you still have to count it. -// -// BX_CPP_AttrNoReturn(): -// This function never returns. The compiler can optimize-out following -// code accordingly. - -#define BX_CPP_AlignN(n) __attribute__ ((aligned (n))) -#define BX_CPP_AttrPrintf(formatArg, firstArg) \ - __attribute__ ((format (printf, formatArg, firstArg))) -#define BX_CPP_AttrNoReturn() __attribute__ ((noreturn)) - -#else - -#define BX_CPP_AlignN(n) /* Not supported. */ -#define BX_CPP_AttrPrintf(formatArg, firstArg) /* Not supported. */ -#define BX_CPP_AttrNoReturn() /* Not supported. */ - -#endif - -#define BX_DEBUGGER 0 -#define BX_DISASM 1 - -#if (BX_DEBUGGER == 1) && (BX_DISASM == 0) -#error Dissembler is required for BX_DEBUGGER ! -#endif - -#define BX_PROVIDE_CPU_MEMORY 1 -#define BX_PROVIDE_DEVICE_MODELS 1 - -#define BX_PROVIDE_MAIN 1 - -#define BX_INSTRUMENTATION 0 - -// enable BX_DEBUG/BX_ERROR/BX_INFO messages -#define BX_NO_LOGGING 0 - -// enable BX_ASSERT checks -#define BX_ASSERT_ENABLE 1 - -// limited i440FX PCI support -#define BX_SUPPORT_PCI 0 - -// Bochs VBE display interface -#define BX_SUPPORT_VBE 1 - -// CLGD54XX emulation -#define BX_SUPPORT_CLGD54XX 0 - -// ACPI controller -#define BX_SUPPORT_ACPI 0 - -#if (BX_SUPPORT_ACPI && !BX_SUPPORT_PCI) -#error To enable ACPI support, you must also enable PCI -#endif - -// Experimental VGA on PCI -#define BX_SUPPORT_PCIVGA 0 - -// Experimental host PCI device mapping -#define BX_SUPPORT_PCIDEV 0 - -#if (BX_SUPPORT_PCIDEV && !BX_SUPPORT_PCI) -#error To enable PCI host device mapping, you must also enable PCI -#endif - -// limited USB on PCI -#define BX_SUPPORT_PCIUSB 0 - -#if (BX_SUPPORT_PCIUSB && !BX_SUPPORT_PCI) -#error To enable USB, you must also enable PCI -#endif - -#define BX_SUPPORT_BUSMOUSE 0 - -#define BX_SUPPORT_ALIGNMENT_CHECK 1 -#define BX_SUPPORT_FPU 1 -#define BX_SUPPORT_MMX 1 -#define BX_SUPPORT_3DNOW 0 -#define BX_SUPPORT_SSE 2 -#define BX_SUPPORT_SSE_EXTENSION 0 -#define BX_SUPPORT_SSE4A 0 -#define BX_SUPPORT_SSE5A 0 -#define BX_SUPPORT_DAZ 1 -#define BX_SUPPORT_MISALIGNED_SSE 0 -#define BX_SUPPORT_SEP 1 -#define BX_SUPPORT_VME 1 -#define BX_SUPPORT_POPCNT 0 -#define BX_SUPPORT_MONITOR_MWAIT 0 -#define BX_SUPPORT_XSAVE 0 -#define BX_SUPPORT_AES 0 -#define BX_SUPPORT_MOVBE 0 - -#define BX_SUPPORT_MTRR 0 -#define BX_SUPPORT_LARGE_PAGES 0 -#define BX_SUPPORT_GLOBAL_PAGES 0 -#define BX_SUPPORT_PAE 0 - -#define BX_SupportGuest2HostTLB 0 -#define BX_SupportRepeatSpeedups 0 -#define BX_SupportHostAsms 0 - -#define BX_SUPPORT_ICACHE 0 -#define BX_SUPPORT_TRACE_CACHE 0 - -#if (BX_SUPPORT_TRACE_CACHE && BX_SUPPORT_ICACHE==0) -#error Trace cache optimization cannot be compiled without iCache! -#endif - -#if BX_SUPPORT_3DNOW - #define BX_CPU_VENDOR_INTEL 0 -#else - #define BX_CPU_VENDOR_INTEL 1 -#endif - -// Maximum CPUID vendor and brand string lengths -#define BX_CPUID_VENDOR_LEN 12 -#define BX_CPUID_BRAND_LEN 48 - -// if 1, don't do gpf on MSRs that we don't implement -#define BX_IGNORE_BAD_MSR 1 - -// CLFLUSH was introduced together with SSE2 instruction set -#if BX_SUPPORT_SSE >= 2 - #define BX_SUPPORT_CLFLUSH 1 -#else - #define BX_SUPPORT_CLFLUSH 0 -#endif - -#if (BX_SUPPORT_ALIGNMENT_CHECK && BX_CPU_LEVEL < 4) -#error Alignment exception check is not supported in i386 ! -#endif - -#if (BX_SUPPORT_VME && BX_CPU_LEVEL < 5) -#error With CPU level < 5, you must disable v8086 mode extensions ! -#endif - -#if (BX_SUPPORT_MMX && BX_CPU_LEVEL < 5) -#error With CPU level < 5, you must disable MMX support ! -#endif - -#if (!BX_SUPPORT_FPU && BX_CPU_LEVEL > 4) -#error With CPU level > 4, you must enable FPU support ! -#endif - -#if (BX_SUPPORT_MMX && !BX_SUPPORT_FPU) -#error "MMX cannot be compiled without FPU support !" -#endif - -#if (BX_SUPPORT_FPU && BX_CPU_LEVEL < 3) -#error "FPU cannot be compiled without cpu level >= 3 !" -#endif - -#if (BX_SUPPORT_3DNOW && !BX_SUPPORT_MMX) -#error "3DNow! cannot be compiled without MMX support !" -#endif - -#if (BX_SUPPORT_AES && !BX_SUPPORT_SSE) -#error "AES cannot be compiled without SSE support !" -#endif - -#if (BX_SUPPORT_XSAVE && !BX_SUPPORT_SSE) -#error "XSAVE cannot be compiled without SSE support !" -#endif - -#if (BX_SUPPORT_SSE && !BX_SUPPORT_MMX) -#error "SSE cannot be compiled without FPU+MMX support !" -#endif - -#if (BX_CPU_LEVEL<6 && BX_SUPPORT_SSE) -#error "SSE is only supported with CPU_LEVEL >= 6 !" -#endif - -#if (BX_CPU_LEVEL<6 && BX_SUPPORT_SEP) -#error "SYSENTER/SYSEXIT only supported with CPU_LEVEL >= 6 !" -#endif - -#if (BX_SUPPORT_SSE < 3) || (BX_SUPPORT_SSE == 3 && BX_SUPPORT_SSE_EXTENSION == 0) -#if BX_SUPPORT_MOVBE - #error "MOVBE only supported with SSE3E !" -#endif -#endif - -#if (BX_CPU_LEVEL<6 && BX_SUPPORT_PAE) -#error "Physical Address Extensions (PAE) only supported with CPU_LEVEL >= 6 !" -#endif -#if (BX_CPU_LEVEL<6 && BX_SUPPORT_GLOBAL_PAGES) -#error "Page Global Extension (PGE) only supported with CPU_LEVEL >= 6 !" -#endif -#if (BX_CPU_LEVEL<5 && BX_SUPPORT_LARGE_PAGES) -#error "Page Size Extension (PSE) only supported with CPU_LEVEL >= 5 !" -#endif -#if (BX_CPU_LEVEL<6 && BX_SUPPORT_MTRR) -#error "MTRRs only supported with CPU_LEVEL >= 6 !" -#endif - -#if (BX_SUPPORT_PAE && !BX_SUPPORT_LARGE_PAGES) -#error "Physical Address Extensions (PAE) requires large pages support !" -#endif - -#if BX_SUPPORT_X86_64 -// Sanity checks to ensure that you cannot accidently use conflicting options. - -#if BX_CPU_LEVEL < 6 -#error "X86-64 requires cpu level 6 or greater !" -#endif -#if (BX_SUPPORT_SSE<2) -#error "X86-64 requires SSE2 !" -#endif -#if !BX_SUPPORT_PAE -#error "X86-64 requires Physical Address Extensions (PAE) !" -#endif -#if !BX_SUPPORT_GLOBAL_PAGES -#error "X86-64 requires Page Global Extension (PGE) !" -#endif -#if !BX_SUPPORT_LARGE_PAGES -#error "X86-64 requires Page Size Extension (PSE) !" -#endif -#endif - -#define BX_HAVE_GETENV 1 -#define BX_HAVE_SETENV 1 -#define BX_HAVE_SELECT 1 -#define BX_HAVE_SNPRINTF 1 -#define BX_HAVE_VSNPRINTF 1 -#define BX_HAVE_STRTOULL 1 -#define BX_HAVE_STRTOUQ 1 -#define BX_HAVE_STRDUP 1 -#define BX_HAVE_STRREV 0 -#define BX_HAVE_STRUCT_TIMEVAL 1 - -// used in term gui -#define BX_HAVE_COLOR_SET 0 -#define BX_HAVE_MVHLINE 0 -#define BX_HAVE_MVVLINE 0 - - -// set if your compiler does not permit an empty struct -#define BX_NO_EMPTY_STRUCTS 0 - -// set if your compiler does not understand __attribute__ after a struct -#define BX_NO_ATTRIBUTES 0 -#if BX_NO_ATTRIBUTES -#define GCC_ATTRIBUTE(x) /* attribute not supported */ -#else -#define GCC_ATTRIBUTE __attribute__ -#endif - -// set to use fast function calls -#define BX_FAST_FUNC_CALL 0 - -// On gcc2.95+ x86 only -#if BX_FAST_FUNC_CALL && defined(__i386__) && defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) -#if BX_USE_CPU_SMF == 1 -# define BX_CPP_AttrRegparmN(X) __attribute__((regparm(X))) -#else -// FIXME: BX_FAST_FUNC_CALL doesn't work with BX_USE_CPU_SMF = 0 -# define BX_CPP_AttrRegparmN(X) /* Not defined */ -#endif -#else -# define BX_CPP_AttrRegparmN(X) /* Not defined */ -#endif - -// set if your compiler does not allow label at the end of a {} block -#define BX_NO_BLANK_LABELS 1 - -// set if you do have <hash_map>, used in bx_debug/dbg_main.c -#define BX_HAVE_HASH_MAP 0 - -// set if you do have <hash_map.h>, used in bx_debug/dbg_main.c -#define BX_HAVE_HASH_MAP_H 1 - -// set if you do have <set>, used in bx_debug/dbg_main.c -#define BX_HAVE_SET 1 - -// set if you do have <set.h>, used in bx_debug/dbg_main.c -#define BX_HAVE_SET_H 1 - -// Support x86 hardware debugger registers and facilites. -// These are the debug facilites offered by the x86 architecture, -// not the optional built-in debugger. -#define BX_X86_DEBUGGER 0 - -#define BX_SUPPORT_CDROM 1 - -#if BX_SUPPORT_CDROM - // This is the C++ class name to use if we are supporting - // low-level CDROM. -# define LOWLEVEL_CDROM cdrom_interface -#endif - -// NE2K network emulation -#define BX_SUPPORT_NE2K 0 - -// Pseudo PCI NIC -#define BX_SUPPORT_PCIPNIC 0 - -#if (BX_SUPPORT_PCIPNIC && !BX_SUPPORT_PCI) -#error To enable the PCI pseudo NIC, you must also enable PCI -#endif - -// this enables the lowlevel stuff below if one of the NICs is present -#define BX_NETWORKING 0 - -#define BX_ETH_NULL_LOGGING 1 -#define BX_ETH_FBSD_LOGGING 1 - -// determine which NE2K packet mover modules will be enabled -// (this was moved from iodev/eth.h) -#define ETH_NULL 1 -#ifdef BX_USE_ETH_ARPBACK -# define ETH_ARPBACK 1 -#endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__NetBSD_kernel__) || defined(__APPLE__) -#define ETH_FBSD 1 -#endif -#if defined(linux) -#define ETH_LINUX 1 -#endif -#if defined(WIN32) -#define ETH_WIN32 1 -#endif - -// this enables Ethertap packet mover; determined by configure script -#define HAVE_ETHERTAP 0 - -// this enables TUN/TAP packet mover; determined by configure script -#define HAVE_TUNTAP 0 - -// this enables VDE packet mover; determined by configure script -#define HAVE_VDE 0 - - -// I/O Interface to debug -#define BX_SUPPORT_IODEBUG 0 - -// External Debugger -#define BX_EXTERNAL_DEBUGGER 0 - -#ifdef WIN32 -#define BX_FLOPPY0_NAME "Floppy Disk A:" -#define BX_FLOPPY1_NAME "Floppy Disk B:" -#else -#define BX_FLOPPY0_NAME "Floppy Disk 0" -#define BX_FLOPPY1_NAME "Floppy Disk 1" -#endif - -#endif // _BX_CONFIG_H

Added: branches/Cog/processors/IA32/bochs/exploration/Makefile =================================================================== --- branches/Cog/processors/IA32/bochs/exploration/Makefile (rev 0) +++ branches/Cog/processors/IA32/bochs/exploration/Makefile 2011-11-12 21:10:06 UTC (rev 2510) @@ -0,0 +1,20 @@ +CFLAGS=-m32 -I.. -I../../bochs -I../../bochs/cpu -I../../bochs/instrument/stubs -L../cpu -lcpu + +all: printcpu printcpucr printcpuxmm + ./printcpu >BochsIA32Alien-regs.st + ./printcpucr >BochsIA32Alien-cr.st + ./printcpuxmm >BochsIA32Alien-xmm.st + +clean: + rm -f BochsIA32Alien-regs.st BochsIA32Alien-cr.st BochsIA32Alien-xmm.st + rm -f printcpu printcpucr printcpuxmm + rm -f printcpu.exe printcpucr.exe printcpuxmm.exe + +printcpu: printcpu.c + g++ -o $@ printcpu.c $(CFLAGS) + +printcpucr: printcpucr.c + g++ -o $@ printcpucr.c $(CFLAGS) + +printcpuxmm: printcpuxmm.c + g++ -o $@ printcpuxmm.c $(CFLAGS)

Modified: branches/Cog/processors/IA32/bochs/exploration/printcpu.c =================================================================== --- branches/Cog/processors/IA32/bochs/exploration/printcpu.c 2011-11-10 02:11:13 UTC (rev 2509) +++ branches/Cog/processors/IA32/bochs/exploration/printcpu.c 2011-11-12 21:10:06 UTC (rev 2510) @@ -28,19 +28,13 @@ main() { #define stoffsetof(type,field) (offsetof(type,field)+1) -#if 0 -#define print(r,n) printf(#r "@%d\n", offsetof(BX_CPU_C,gen_reg[n].dword.erx)) - - printf("EAX@%d\n",offsetof(BX_CPU_C, gen_reg[0].dword.erx)); - -#else #define print(r,n) \ printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ - "%s\r\t^self unsignedLongAt: %d! !\r", m,d,y,h,i, lower(#r), \ + "%s\r\t^self unsignedLongAt: %ld! !\r", m,d,y,h,i, lower(#r), \ stoffsetof(BX_CPU_C,gen_reg[n].dword.erx));\ printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ - "%s: anUnsignedInteger\r\t^self unsignedLongAt: %d put: anUnsignedInteger! !\r", m,d,y,h,i, lower(#r), \ - stoffsetof(BX_CPU_C,gen_reg[n].dword.erx));\ + "%s: anUnsignedInteger\r\t^self unsignedLongAt: %ld put: anUnsignedInteger! !\r", m,d,y,h,i, lower(#r), \ + stoffsetof(BX_CPU_C,gen_reg[n].dword.erx))

time_t nowsecs = time(0); struct tm now = *localtime(&nowsecs); @@ -52,12 +46,11 @@

printf(""Hello world!!"!\r"); printf("!BochsIA32Alien class methodsFor: 'instance creation' stamp: 'eem %d/%d/%d %d:%02d'!\r" - "dataSize\r\t^%d! !\r", m,d,y,h,i, sizeof(BX_CPU_C)); + "dataSize\r\t^%ld! !\r", m,d,y,h,i, sizeof(BX_CPU_C));

printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r" - "eflags\r\t^self unsignedLongAt: %d! !\r", m,d,y,h,i, - stoffsetof(BX_CPU_C,eflags)); -#endif + "eflags\r\t^self unsignedLongAt: %ld! !\r", m,d,y,h,i, + stoffsetof(BX_CPU_C,eflags));

print(EAX,BX_32BIT_REG_EAX); print(EBX,BX_32BIT_REG_EBX);

Modified: branches/Cog/processors/IA32/bochs/exploration/printcpucr.c =================================================================== --- branches/Cog/processors/IA32/bochs/exploration/printcpucr.c 2011-11-10 02:11:13 UTC (rev 2509) +++ branches/Cog/processors/IA32/bochs/exploration/printcpucr.c 2011-11-12 21:10:06 UTC (rev 2510) @@ -32,10 +32,10 @@ #define stoffsetof(type,field) (offsetof(type,field)+1) #define print(r,ra,len) \ printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ - "%s\r\t^self unsigned" #len "At: %d! !\r", m,d,y,h,i, munge(#r), \ + "%s\r\t^self unsigned" #len "At: %ld! !\r", m,d,y,h,i, munge(#r), \ stoffsetof(BX_CPU_C,ra));\ printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ - "%s: anUnsignedInteger\r\t^self unsigned" #len "At: %d put: anUnsignedInteger! !\r", m,d,y,h,i, munge(#r), \ + "%s: anUnsignedInteger\r\t^self unsigned" #len "At: %ld put: anUnsignedInteger! !\r", m,d,y,h,i, munge(#r), \ stoffsetof(BX_CPU_C,ra));

time_t nowsecs = time(0);

Modified: branches/Cog/processors/IA32/bochs/exploration/printcpuxmm.c =================================================================== --- branches/Cog/processors/IA32/bochs/exploration/printcpuxmm.c 2011-11-10 02:11:13 UTC (rev 2509) +++ branches/Cog/processors/IA32/bochs/exploration/printcpuxmm.c 2011-11-12 21:10:06 UTC (rev 2510) @@ -30,10 +30,10 @@ #define stoffsetof(type,field) (offsetof(type,field)+1) #define print(r,n,lh) \ printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ - "%s\r\t^self unsignedLongLongAt: %d! !\r", m,d,y,h,i, lower(#r), \ + "%s\r\t^self unsignedLongLongAt: %ld! !\r", m,d,y,h,i, lower(#r), \ stoffsetof(BX_CPU_C,xmm[n]._u64[lh]));\ printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ - "%s: anUnsignedInteger\r\t^self unsignedLongLongAt: %d put: anUnsignedInteger! !\r", m,d,y,h,i, lower(#r), \ + "%s: anUnsignedInteger\r\t^self unsignedLongLongAt: %ld put: anUnsignedInteger! !\r", m,d,y,h,i, lower(#r), \ stoffsetof(BX_CPU_C,xmm[n]._u64[lh]));\

time_t nowsecs = time(0);

Added: branches/Cog/processors/IA32/linuxbochs/conf.COG =================================================================== --- branches/Cog/processors/IA32/linuxbochs/conf.COG (rev 0) +++ branches/Cog/processors/IA32/linuxbochs/conf.COG 2011-11-12 21:10:06 UTC (rev 2510) @@ -0,0 +1,49 @@ +#!/bin/sh + +# this sets up the compile for Cog on linux. Disable as much inessential stuff +# as possible leaving only the cpu/fpu & memory interface + +# build cpu/libcpu.a disasm/libdisasm.a fpu/libfpu.a using +# $ ./conf.COG +# $ ../bochs/makeem + +set echo +# CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-labels=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -fprefetch-loop-arrays $CFLAGS" +CFLAGS="-m32 $CFLAGS" +CFLAGS="-Dlongjmp=_longjmp -Dsetjmp=_setjmp $CFLAGS" +CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions $CFLAGS" +CFLAGS="-g $CFLAGS" +CPPFLAGS="" +CXXFLAGS="$CFLAGS" + +export CFLAGS +export CPATH +export CPPFLAGS +export CXXFLAGS +export LDFLAGS + +../bochs/configure \ + --enable-Cog \ + --enable-cpu-level=6 \ + --enable-sse=2 \ + --enable-assert-checks \ + --with-nogui \ + --disable-x86-64 \ + --disable-pae \ + --disable-large-pages \ + --disable-global-pages \ + --disable-mtrr \ + --disable-sb16 \ + --disable-ne2000 \ + --disable-pci \ + --disable-acpi \ + --disable-apic \ + --disable-clgd54xx \ + --disable-usb \ + --disable-plugins \ + ${CONFIGURE_ARGS} + +# apic == Advanced programmable Interrupt Controller +# acpi == Advanced Configuration and Power Interface +# pci == Peripheral Component Interconnect local bus +# clgd54xx == Cirrus Logic GD54xx video card

Property changes on: branches/Cog/processors/IA32/linuxbochs/conf.COG ___________________________________________________________________ Added: svn:executable + *

Added: branches/Cog/processors/IA32/macbochs/conf.COG =================================================================== --- branches/Cog/processors/IA32/macbochs/conf.COG (rev 0) +++ branches/Cog/processors/IA32/macbochs/conf.COG 2011-11-12 21:10:06 UTC (rev 2510) @@ -0,0 +1,49 @@ +#!/bin/sh + +# this sets up the compile for Cog on Mac OS X. Disable as much inessential +# stuff as possible leaving only the cpu/fpu & memory interface + +# build cpu/libcpu.a disasm/libdisasm.a fpu/libfpu.a using +# $ ./conf.COG +# $ ../bochs/makeem + +set echo +# CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-labels=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -fprefetch-loop-arrays $CFLAGS" +CFLAGS="-m32 $CFLAGS" +CFLAGS="-Dlongjmp=_longjmp -Dsetjmp=_setjmp $CFLAGS" +CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions $CFLAGS" +CFLAGS="-g $CFLAGS" +CPPFLAGS="" +CXXFLAGS="$CFLAGS" + +export CFLAGS +export CPATH +export CPPFLAGS +export CXXFLAGS +export LDFLAGS + +../bochs/configure \ + --enable-Cog \ + --enable-cpu-level=6 \ + --enable-sse=2 \ + --enable-assert-checks \ + --with-nogui \ + --disable-x86-64 \ + --disable-pae \ + --disable-large-pages \ + --disable-global-pages \ + --disable-mtrr \ + --disable-sb16 \ + --disable-ne2000 \ + --disable-pci \ + --disable-acpi \ + --disable-apic \ + --disable-clgd54xx \ + --disable-usb \ + --disable-plugins \ + ${CONFIGURE_ARGS} + +# apic == Advanced programmable Interrupt Controller +# acpi == Advanced Configuration and Power Interface +# pci == Peripheral Component Interconnect local bus +# clgd54xx == Cirrus Logic GD54xx video card

Property changes on: branches/Cog/processors/IA32/macbochs/conf.COG ___________________________________________________________________ Added: svn:executable + *

Added: branches/Cog/processors/IA32/winbochs/conf.COG =================================================================== --- branches/Cog/processors/IA32/winbochs/conf.COG (rev 0) +++ branches/Cog/processors/IA32/winbochs/conf.COG 2011-11-12 21:10:06 UTC (rev 2510) @@ -0,0 +1,50 @@ +#!/bin/sh + +# this sets up the compile for Cog on win32 under cygwin. Disable as much +# inessential stuff as possible leaving only the cpu/fpu & memory interface + +# build cpu/libcpu.a disasm/libdisasm.a fpu/libfpu.a using +# $ ./conf.COG +# $ ../bochs/makeem + +set echo +# CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-labels=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -fprefetch-loop-arrays $CFLAGS" +CFLAGS="-m32 $CFLAGS" +CFLAGS="-Dsetjmp=_setjmp $CFLAGS" +CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions $CFLAGS" +CFLAGS="-g $CFLAGS" +CPPFLAGS="" +CXXFLAGS="$CFLAGS" + +export CFLAGS +export CPATH +export CPPFLAGS +export CXXFLAGS +export LDFLAGS + +../bochs/configure \ + -target=i686-pc-mingw32 \ + --enable-Cog \ + --enable-cpu-level=6 \ + --enable-sse=2 \ + --enable-assert-checks \ + --with-nogui \ + --disable-x86-64 \ + --disable-pae \ + --disable-large-pages \ + --disable-global-pages \ + --disable-mtrr \ + --disable-sb16 \ + --disable-ne2000 \ + --disable-pci \ + --disable-acpi \ + --disable-apic \ + --disable-clgd54xx \ + --disable-usb \ + --disable-plugins \ + ${CONFIGURE_ARGS} + +# apic == Advanced programmable Interrupt Controller +# acpi == Advanced Configuration and Power Interface +# pci == Peripheral Component Interconnect local bus +# clgd54xx == Cirrus Logic GD54xx video card