From d86facd088b3facb36230ce0d4a630241650a265 Mon Sep 17 00:00:00 2001 From: Bryce Denney Date: Sun, 17 Mar 2002 09:39:41 +0000 Subject: [PATCH] - removed this. The patch is too specific to a particular version so it only applies to the release. I can't make a better patch with cvs diff AFAIK because the patch adds files. It's just a mess. So I'll just put up an occasional source snapshot on SF instead of trying to keep this horrible patch alive. Cvs users, just do "cvs upd -r BRANCH-cpanel" and don't bother with this patch. --- bochs/patches/patch.wxwindows | 5984 --------------------------------- 1 file changed, 5984 deletions(-) delete mode 100644 bochs/patches/patch.wxwindows diff --git a/bochs/patches/patch.wxwindows b/bochs/patches/patch.wxwindows deleted file mode 100644 index 2d09e76e1..000000000 --- a/bochs/patches/patch.wxwindows +++ /dev/null @@ -1,5984 +0,0 @@ -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/.conf.linux wxclean/.conf.linux ---- clean-1.4.pre2/.conf.linux Sun Oct 7 17:23:00 2001 -+++ wxclean/.conf.linux Sun Mar 17 04:12:46 2002 -@@ -6,7 +6,7 @@ - - CC="gcc" - CXX="c++" --CFLAGS="-Wall -O2 -fomit-frame-pointer -pipe" -+CFLAGS="-Wall -g -fomit-frame-pointer -pipe" - CXXFLAGS="$CFLAGS" - - export CC -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/Makefile.in wxclean/Makefile.in ---- clean-1.4.pre2/Makefile.in Mon Mar 11 12:02:26 2002 -+++ wxclean/Makefile.in Sun Mar 17 04:12:46 2002 -@@ -74,11 +74,11 @@ - - CC = @CC@ - CXX = @CXX@ --CFLAGS = @CFLAGS@ $(MCH_CFLAGS) $(FLA_FLAGS) --CXXFLAGS = @CXXFLAGS@ $(MCH_CFLAGS) $(FLA_FLAGS) -+CFLAGS = @CFLAGS@ $(MCH_CFLAGS) $(FLA_FLAGS) `wx-config --cflags` -+CXXFLAGS = @CXXFLAGS@ $(MCH_CFLAGS) $(FLA_FLAGS) `wx-config --cxxflags` - - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -+LIBS = `wx-config --libs` @LIBS@ - # To compile with readline: - # linux needs just -lreadline - # solaris needs -lreadline -lcurses -@@ -96,7 +96,7 @@ - GUI_LINK_OPTS_CARBON = -framework Carbon - GUI_LINK_OPTS_NOGUI = - GUI_LINK_OPTS_TERM = @GUI_LINK_OPTS_TERM@ --GUI_LINK_OPTS = @GUI_LINK_OPTS@ -+GUI_LINK_OPTS = @GUI_LINK_OPTS@ `wx-config --libs` - RANLIB = @RANLIB@ - - BX_INCDIRS = -I. -I$(srcdir)/. -I@INSTRUMENT_DIR@ -I$(srcdir)/@INSTRUMENT_DIR@ -@@ -127,7 +127,8 @@ - load32bitOShack.o \ - state_file.o \ - pc_system.o \ -- osdep.o -+ osdep.o \ -+ wxmain.o - - EXTERN_ENVIRONMENT_OBJS = \ - main.o \ -@@ -187,7 +188,7 @@ - bxversion.h: - $(RM) -f bxversion.h - echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h -- echo '// $$Id: Makefile.in,v 1.66 2002/03/11 16:59:58 bdenney Exp $$' >> bxversion.h -+ echo '// $$Id: Makefile.in,v 1.28.2.5 2002/03/17 09:06:21 bdenney Exp $$' >> bxversion.h - echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h - echo '// This file is generated by "make bxversion.h"' >> bxversion.h - echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h -@@ -348,7 +349,7 @@ - V6WORKSPACE_FILES=bochs.dsw bochs.dsp bochs.opt cpu/cpu.dsp \ - memory/memory.dsp iodev/iodev.dsp instrument/stubs/stubs.dsp \ - gui/gui.dsp fpu/fpu.dsp disasm/disasm.dsp debug/debug.dsp \ -- misc/niclist.dsp bximage.dsp -+ misc/niclist.dsp bximage.dsp wxthreadtest.dsp - - v6workspace: - zip $(V6WORKSPACE_ZIP) $(V6WORKSPACE_FILES) -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/README wxclean/README ---- clean-1.4.pre2/README Mon Mar 11 12:56:04 2002 -+++ wxclean/README Sun Mar 17 04:12:46 2002 -@@ -1,3 +1,201 @@ -+Readme for BRANCH-cpanel branch -+updated Sun Mar 17 01:08:40 2002 -+Bryce Denney -+ -+------------- -+Mar 17: This code now has all the changes from the main branch up to -+the latest release 1.4.pre2. -+------------- -+ -+wxWindows Configuration Interface -+ -+This branch began in June 2001 when the most recent bochs version was -+1.2.1. Dave Poirier and Bryce Denney started adding a wxWindows -+configuration interface. So far, it uses the platform's native -+interface to show the vga screen and the traditional bitmap buttons. -+The wxWindows window is a separate window, and eventually it will let -+you choose between different configurations, manage all the bochsrc options, -+create new disk images (?), and then start a simulation. -+ -+Right now, the wxWindows window appears first. This will be where -+you can choose a preset configuration or create one from scratch, then -+edit the bochsrc options using the GUI. Then, by clicking on some button or a -+menu option, you can start up the Bochs simulation. For now, the simulation -+creates its own window for vga display and the traditional buttons, which -+still use the platform-dependent gui code (not wxwindows). -+ -+WARNING: Don't expect stable or complete code yet! -+ -+I have tested in linux, where a "configure;make" should work fine. -+More recently, I have been developing in MSVC++ using projects and -+workspaces. To build in VC++: -+ -+- in cygwin, do "sh .conf.win32-vcpp". If you want different configure -+ options from the default, edit .conf.win32-vcpp first. -+- in cygwin, do "unzip build/win32/workspace.zip", or use winzip. Now -+ you should have bochs.dsw and bochs.dsp in the main directory. -+- open up bochs.dsw, the workspace file. -+- edit project settings so that VC++ can find the wxWindows include -+ files and libraries on your system. I installed them in -+ d:/wx/wx232/include and d:/wx/wx232/lib. Specifically, edit -+ - Project>Settings>C/C++>Preprocessor: include directories. -+ - Project>Settings>Link>Input: additional library path. -+- build -+ -+Note that the project is set up for wxWindows 2.3.2, and the only -+configuration that I've used is called Win32 Debug. To use on -+other wxwindows versions, you will have to change some of the names -+of the libraries to include. Use the samples that came with that -+version of wxwindows for reference. -+ -+What works right now: -+- cd to a directory with a bochsrc and disk images in it (I use dlxlinux) -+- start up bochs. You get a small wxwindows window with a File menu. -+- choose "start bochs" on the file menu. -+- a new window pops up with is the normal bochs window -+- click on the floppy icon for A or B. You get a modal dialog box from -+ the control panel that lets you choose a new image file name. Click -+ the new image file, and ok. Now you can read the new image file in -+ Bochs. If the file you select or type is readable, the floppy icon shows a -+ good floppy disk. If you type "none" or choose an unreadable file, -+ the floopy icon will show a disk with an X through it. -+- That's all. Nothing else works except for quit. -+------------------------------------------------------ -+ -+Added some sketches in README.gui-sketch. I'm thinking that the control -+panel will be able to basically show one of these screens at a time. When -+you first start you would see ChooseConfigScreen which chooses between the -+configurations that you have loaded recently (which it would remember -+by the pathname of their bochsrc). Whether you choose an existing -+configuration to be loaded or a new one, when you click Ok you go to -+the first configuration screen, ConfigDiskScreen. -+ -+Each of the configuration screens takes up the whole control panel window. -+We could use tabs on the top and/or "<-Prev" and "Next->" buttons to make -+it quick to navigate the configuration screens. Each screen should -+probably have a Prev, Next, Revert to Saved, and Accept button. -+The menu choices like Disk..., VGA..., etc. just switch directly to -+that tab. -+ -+ -+------------------------------------------------------ -+Notes: -+ -+events from gui to sim: -+- [async] key pressed or released -+- [async] mouse motion with button state -+- [sync] query parameter -+- [sync] change parameter -+- [async] start, pause, stop, reset simulation. Can be implemented -+ as changing a parameter. -+- [async] request notification when some param changes -+ -+events from sim to gui: -+- [async] log message to be displayed (or not) -+- [async] ask user how to proceed (like panic: action=ask) -+- [async] param value changed -+- make my thread sleep for X microseconds (call wxThread::sleep then return) -+ -+ -+implement the floppyA and floppyB change buttons using new event -+structure. How should it work? -+ -+vga gui detects a click on floppyA bitmap -+construct a BxEvent type BX_EVT_ASK_PARAM -+post the event to the wxwindows gui thread (somehow) and block for response -+when it arrives in the gui thread, show a modal dialog box -+get the answer back to the simulator thread -+ -+ -+right now, this is working ok within the simulator thread using -+wxMutexGuiEnter/Leave. Still I'm going to change it so that the -+siminterface.cc code builds an event structure and the gui code -+fills in the blank in the structure, instead of the stupid -+notify_get_int_arg stuff. -+ -+ -+Starting and Killing Threads -+ -+When a detachable (default) thread finishes (returns from its Entry() -+function), wxwindows frees the memory associated with that thread. -+Unless the thread is never going to end, it is potentially dangerous to have a -+pointer to it at all. Even if you try to "check if it's alive" first, you may -+be dereferencing the pointer after it has already been deleted, leading to it -+claiming to be alive when it's not, or a segfault. To solve this, the approach -+used in the wxwindows threads example is to have code in the thread's OnExit() -+method remove the thread's pointer from the list of usable threads. In -+addition, any references or changes to the list of threads is controlled by a -+critical section to ensure that it stays correct. This post finally -+explained what I was seeing. -+ -++----------------------- -+| From: Pieter van der Meulen (pgmvdm@yahoo.com) -+| Subject: Re: Thread Sample program - bug -+| Newsgroups: comp.soft-sys.wxwindows -+| Date: 2001-06-28 17:51:35 PST -+| -+| -+| At 06:24 PM 6/28/2001, you wrote: -+| >Hi, -+| >I have wxWindows 2.2.7 (wxMSW) installed. -+| > -+| >I just found in the thread.cpp sample code this section: -+| > -+| > -+| >void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) ) -+| >{ -+| > size_t count = wxGetApp().m_threads.Count(); -+| > for ( size_t i = 0; i < count; i++ ) -+| > { -+| >===> wxGetApp().m_threads[0]->Delete(); <===== -+| > } -+| > -+| > Close(TRUE); -+| >} -+| > -+| >The indecated line should probably rather have a -+| >m_threads[i] rather than m_threads[0] . -+| -+| No, it should not, although it is not immediately obvious. When Delete() is -+| called, the thread will eventually delete itself, but not before it calls -+| MyThread::Exit(), which will remove itself from m_threads[] using -+| wxArray::Remove(this). wxArray::Remove (RemoveAt) will compact the array to -+| remove the element, it is now size-1. After this wxThread::Delete() returns. -+| -+| -+| >I have have a further question to this: -+| >Does this mean that a detached thread created with new -+| >HAS to be deleted manually ? Or is this only in case it might still -+| >be running? -+| -+| Firstly, you must create every detached thread using new since it will -+| delete itself, literally calling delete this. -+| Calling wxThread::Delete() is a correct way to terminate a thread, but -+| manually deleting (using delete) a detached wxThread object is not. -+| wxThread::Delete() will ask the thread to exit, the thread should check for -+| this in wxThread::Entry() regularly using wxThread::TestDestroy() and exit -+| when asked to do so. -+| -+| >(In general I have a unsatisfied felling about when delete is -+| >neccessary and when not -- "I only know, it's not , if the class is -+| >derived from wxWindows") -+| -+| For wxThreads: joinable threads must be deleted (when allocated on the -+| heap), detached threads may never be deleted. For other classes, consult -+| the documentation ;) -+| -+| -+| >Thanks for some feedback, -+| >Sebastian -+| -+| Regards, -+| -+| Pieter. -++----------------------- -+ -+ -+ -+------------------------------------------------------------- - Bochs x86 Pentium Emulator - Upated: Mon Mar 11 12:30:24 2002 - Version: 1.4.pre2 -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/README.gui-sketch wxclean/README.gui-sketch ---- clean-1.4.pre2/README.gui-sketch Wed Dec 31 19:00:00 1969 -+++ wxclean/README.gui-sketch Sun Mar 17 02:41:34 2002 -@@ -0,0 +1,201 @@ -+Here are some quick ASCII sketches of what different parts of the interface -+look like. Nothing is implemented yet, and everything is open for debate. -+Whoever writes the wxwindows code for any of these screens gets several -+thousand votes. -+ -+ -+Menus: -+- Configuration -+ +----------------------+ -+ | New Configuration | -+ | Read Configuration | -+ | Save Configuration | -+ +----------------------+ -+ | Quit | -+ +----------------------+ -+- Edit -+ +----------------------+ -+ | Disks... | -+ | Boot -----------> Floppy, Hard disk, or Cdrom -+ | VGA... | -+ | Memory... | -+ | Sound... | -+ | Networking... | -+ | Keyboard... | -+ | Other... | -+ +----------------------+ -+- Simulate -+ +----------------------+ -+ | Start | -+ | Pause/Resume | -+ | Stop | -+ +----------------------+ -+ | Speed... | -+ +----------------------| -+- Debug -+ +----------------------| -+ | Show CPU | -+ | Show Memory | -+ | ? what else ? | -+ +----------------------| -+- Event Log -+ +----------------------+ -+ | View | -+ | Preferences... | -+ | By Device... | -+ +----------------------+ -+- Help -+ +----------------------+ -+ | About Bochs... | -+ +----------------------+ -+ -+What should show up on the control panel when it first comes up? -+I think the standard thing should be to choose a configuration and -+start simulating. -+ -+ -+ChooseConfigScreen: -++--------------------------------------------------------+ -+| | -+| Choose a configuration for the Bochs simulator: | -+| | -+| +---+ | -+| | O | DLX Linux Demo | -+| | | | Boot 10MB Hard Disk | -+| +---+ | -+| | -+| +---+ | -+| | O | Redhat Linux Image | -+| | | | Boot 10MB Hard Disk | -+| +---+ | -+| | -+| +---+ | -+| | O | FreeDOS | -+| | | | Boot 40MB Hard Disk | -+| +---+ | -+| | -+| | -+| ?? Create new configuration | -+| | -+| | -+| [ | -++--------------------------------------------------------+ -+ -+ConfigDisksScreen: -++---------------------------------------------------------------+ -+| | -+| /----+ | -+| |= =| A Drive +----+ | -+| [ ] | __ | Raw Floppy Drive |Edit| | -+| || || A: +----+ | -+| ++--++ | -+| | -+| /----+ | -+| |= =| B Drive +----+ | -+| [ ] | __ | Floppy Disk Image |Edit| | -+| || || C:\Bochs\Images\A.img +----+ | -+| ++--++ | -+| | -+| +-----+ C Drive | -+| |=====| Hard Disk Image +----+ | -+| [BOOT] | o| C:\Bochs\Images\HD30meg.img |Edit| | -+| +-----+ +----+ | -+| | -+| ___ | -+| / \ D Drive +----+ | -+| [ ] | O | ISO CD Image |Edit| | -+| \___/ C:\Bochs\Images\BootCD.img +----+ | -+| | -+| | -++---------------------------------------------------------------+ -+ -+EditFloppyScreen: -++---------------------------------------------------------------+ -+| | -+| Bochs can use a real floppy drive as Disk A, or use an | -+| image file. | -+| | -+| [X] Physical A: drive | -+| [ ] Physical B: drive | -+| [ ] Disk image: [_____________________________] [Browse] | -+| Capacity: [1.44 MB] | -+| | -+| Hint: To create a disk image, choose the name and capacity | -+| above, then click Ok. | -+| | -+| [ Cancel ] [ Ok ] | -++---------------------------------------------------------------+ -+ -+ -+ConfigVgaScreen: -+FIXME -+ -+ConfigMemoryScreen: -+romimage: file=bios/BIOS-bochs-latest, address=0xf0000 -+megs: 32 -+vgaromimage: bios/VGABIOS-elpin-2.40 -+FIXME -+ -+ConfigSoundScreen: -+sb16: midimode=1, midi=/dev/midi00, wavemode=1, wave=/dev/dsp, loglevel=2, log=sb16.log, dmatimer=600000 -+FIXME -+ -+ConfigNetworkingScreen: -++---------------------------------------------------------------+ -+| | -+| Bochs can emulate an NE2000-compatible network card. Would | -+| you like to enable it? | -+| | -+| Enable networking? [X] | -+| | -+| NE2000 I/O address: [ 0x280 ] | -+| IRQ: [ 9 ] | -+| MAC address: [ b0:c4:00:00:00:00 ] | -+| Connection to the OS: [ Linux Packet Filter ] | -+| Physical NIC to use: [ eth0 ] | -+| NE2000 Debug messages: [ ] | -+| | -++---------------------------------------------------------------+ -+ -+ConfigKeyboardScreen: -+keyboard_mapping: enabled=1, map=US,France,Germany,Spain -+keyboard_type: xt,at,mf -+keyboard_serial_delay: 250 -+ -+FIXME -+ -+ConfigOtherScreen: -+FIXME -+ -+ConfigSpeedScreen: -+explain what the heck ips is -+adjust ips with a slider? -+FIXME -+ -+EventLogPreferences: -+FIXME -+panic: action=ignore,report,fatal,ask -+error: action=ignore,report,fatal,ask -+info: action=ignore,report,fatal,ask -+debug: action=ignore,report,fatal,ask -+ -+EventLogPrefByDevice: -+FIXME -+keyboard panic=ask error=report info=report debug=ignore -+vga panic=ask error=report info=report debug=ignore -+network panic=ask error=report info=report debug=ignore -+cpu panic=ask error=report info=report debug=ignore -+sound panic=ask error=report info=report debug=ignore -+etc. for about 20 devices. -+ -+DebugShowCpuRegisters: -+show standard cpu registers and state -+values will update in real time -+this is sort of the start of the debugger interface -+when debugging, maybe highlight values that change between sim steps -+ -+DebugShowMemory: -+let use choose memory ranges to display -+when debugging, maybe highlight values that change between sim steps -+ -+ -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/bios/rombios.c wxclean/bios/rombios.c ---- clean-1.4.pre2/bios/rombios.c Sun Mar 17 04:16:28 2002 -+++ wxclean/bios/rombios.c Sun Mar 17 04:12:48 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: rombios.c,v 1.37 2002/03/11 00:17:30 cbothamy Exp $ -+// $Id: rombios.c,v 1.14.2.1 2002/03/17 08:51:19 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2002 MandrakeSoft S.A. -@@ -995,10 +995,10 @@ - - #endif // BX_ELTORITO_BOOT - --static char bios_cvs_version_string[] = "$Revision: 1.37 $"; --static char bios_date_string[] = "$Date: 2002/03/11 00:17:30 $"; -+static char bios_cvs_version_string[] = "$Revision: 1.14.2.1 $"; -+static char bios_date_string[] = "$Date: 2002/03/17 08:51:19 $"; - --static char CVSID[] = "$Id: rombios.c,v 1.37 2002/03/11 00:17:30 cbothamy Exp $"; -+static char CVSID[] = "$Id: rombios.c,v 1.14.2.1 2002/03/17 08:51:19 bdenney Exp $"; - - /* Offset to skip the CVS $Id: prefix */ - #define bios_version_string (CVSID + 4) -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/bios/usage.cc wxclean/bios/usage.cc ---- clean-1.4.pre2/bios/usage.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/bios/usage.cc Sun Mar 17 04:12:48 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: usage.cc,v 1.3 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: usage.cc,v 1.2.8.2 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -@@ -45,7 +45,7 @@ - - if (argc !=3 ) { - fprintf(stderr, "Usage: usage bios-file org-file\n"); -- exit(1); -+ BX_EXIT(1); - } - - bios_file = open(argv[1], O_RDONLY); -@@ -53,7 +53,7 @@ - - if ( (bios_file<0) | (org_file==NULL) ) { - fprintf(stderr, "problems opening files.\n"); -- exit(1); -+ BX_EXIT(1); - } - - printf("files opened OK\n"); -@@ -64,7 +64,7 @@ - retval = read(bios_file, &bios[index], to_read); - if (retval <= 0) { - fprintf(stderr, "problem reading bios file\n"); -- exit(1); -+ BX_EXIT(1); - } - to_read -= retval; - index += retval; -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/bochs.h wxclean/bochs.h ---- clean-1.4.pre2/bochs.h Tue Mar 5 10:52:24 2002 -+++ wxclean/bochs.h Sun Mar 17 04:12:46 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: bochs.h,v 1.59 2002/03/03 06:03:29 bdenney Exp $ -+// $Id: bochs.h,v 1.39.2.3 2002/03/17 08:51:16 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -@@ -463,7 +463,7 @@ - - #define BX_ASSERT(x) do {if (!(x)) BX_PANIC(("failed assertion \"%s\" at %s:%d\n", #x, __FILE__, __LINE__));} while (0) - void bx_signal_handler (int signum); --void bx_atexit(void); -+int bx_atexit(void); - extern bx_debug_t bx_dbg; - - -@@ -516,7 +516,7 @@ - #define BX_RESET_SOFTWARE 10 - #define BX_RESET_HARDWARE 11 - -- -+void bx_init_before_control_panel (); - char *bx_find_bochsrc (void); - int bx_parse_cmdline (int arg, int argc, char *argv[]); - int bx_read_configuration (char *rcfile); -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/build/redhat/make-rpm wxclean/build/redhat/make-rpm ---- clean-1.4.pre2/build/redhat/make-rpm Sat Dec 8 10:59:50 2001 -+++ wxclean/build/redhat/make-rpm Sun Mar 17 04:12:50 2002 -@@ -1,6 +1,6 @@ - #!/bin/bash -x - ######################################################################### --# $Id: make-rpm,v 1.1 2001/12/08 15:59:50 bdenney Exp $ -+# $Id: make-rpm,v 1.1.4.1 2002/03/17 08:51:19 bdenney Exp $ - ######################################################################### - # build/redhat/make-rpm - # -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/build/win32/cc2cpp wxclean/build/win32/cc2cpp ---- clean-1.4.pre2/build/win32/cc2cpp Wed Dec 31 19:00:00 1969 -+++ wxclean/build/win32/cc2cpp Sun Mar 17 03:54:18 2002 -@@ -0,0 +1,6 @@ -+#!/bin/sh -+ -+list=`find . -name '*.cc' | sed 's/\.cc$//'` -+for i in $list; do -+ mv ${i}.cc ${i}.cpp -+done -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/build/win32/cpp2cc wxclean/build/win32/cpp2cc ---- clean-1.4.pre2/build/win32/cpp2cc Wed Dec 31 19:00:00 1969 -+++ wxclean/build/win32/cpp2cc Sun Mar 17 03:54:18 2002 -@@ -0,0 +1,6 @@ -+#!/bin/sh -+ -+list=`find . -name '*.cpp' | sed 's/\.cpp$//'` -+for i in $list; do -+ mv ${i}.cpp ${i}.cc -+done -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/build/win32/diffcc2cpp wxclean/build/win32/diffcc2cpp ---- clean-1.4.pre2/build/win32/diffcc2cpp Wed Dec 31 19:00:00 1969 -+++ wxclean/build/win32/diffcc2cpp Sun Mar 17 03:54:18 2002 -@@ -0,0 +1,6 @@ -+#!/bin/sh -+ -+list=`find . -name '*.cpp' | sed 's/\.cpp$//'` -+for i in $list; do -+ diff -u ${i}.cc ${i}.cpp -+done -Binary files clean-1.4.pre2/build/win32/workspace.zip and wxclean/build/win32/workspace.zip differ -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/config.h.in wxclean/config.h.in ---- clean-1.4.pre2/config.h.in Fri Mar 8 23:08:54 2002 -+++ wxclean/config.h.in Sun Mar 17 04:12:46 2002 -@@ -40,6 +40,17 @@ - // USER CONFIGURABLE OPTIONS : EDIT ONLY OPTIONS IN THIS SECTION // - /////////////////////////////////////////////////////////////////// - -+ -+#define USE_WX 1 -+ -+#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 -+ - #define BX_USE_CONTROL_PANEL 1 - - // I have tested the following combinations: -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/access.cc wxclean/cpu/access.cc ---- clean-1.4.pre2/cpu/access.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/access.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: access.cc,v 1.12 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: access.cc,v 1.7.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/apic.cc wxclean/cpu/apic.cc ---- clean-1.4.pre2/cpu/apic.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/apic.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: apic.cc,v 1.8 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: apic.cc,v 1.6.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - #define NEED_CPU_REG_SHORTCUTS 1 -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/arith16.cc wxclean/cpu/arith16.cc ---- clean-1.4.pre2/cpu/arith16.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/arith16.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: arith16.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: arith16.cc,v 1.5.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/arith32.cc wxclean/cpu/arith32.cc ---- clean-1.4.pre2/cpu/arith32.cc Sat Nov 17 17:22:04 2001 -+++ wxclean/cpu/arith32.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: arith32.cc,v 1.7 2001/11/17 22:22:03 bdenney Exp $ -+// $Id: arith32.cc,v 1.5.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/arith8.cc wxclean/cpu/arith8.cc ---- clean-1.4.pre2/cpu/arith8.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/arith8.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: arith8.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: arith8.cc,v 1.5.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/bcd.cc wxclean/cpu/bcd.cc ---- clean-1.4.pre2/cpu/bcd.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/bcd.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: bcd.cc,v 1.5 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: bcd.cc,v 1.4.4.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/bit.cc wxclean/cpu/bit.cc ---- clean-1.4.pre2/cpu/bit.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/bit.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: bit.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: bit.cc,v 1.5.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/cpu.cc wxclean/cpu/cpu.cc ---- clean-1.4.pre2/cpu/cpu.cc Tue Mar 5 10:52:26 2002 -+++ wxclean/cpu/cpu.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: cpu.cc,v 1.23 2002/02/15 22:58:06 yakovlev Exp $ -+// $Id: cpu.cc,v 1.12.2.2 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -@@ -476,6 +476,9 @@ - return; - } - #endif -+ } else if (BX_CPU_THIS_PTR kill_bochs_request) { -+ // setting kill_bochs_request causes the cpu loop to return ASAP. -+ return; - } - - -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/cpu.h wxclean/cpu/cpu.h ---- clean-1.4.pre2/cpu/cpu.h Wed Oct 3 15:53:48 2001 -+++ wxclean/cpu/cpu.h Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: cpu.h,v 1.15 2001/10/03 19:53:48 instinc Exp $ -+// $Id: cpu.h,v 1.8.2.2 2002/03/17 08:50:39 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -@@ -764,6 +764,7 @@ - Bit32u debug_trap; // holds DR6 value to be set as well - volatile Boolean async_event; - volatile Boolean INTR; -+ volatile Boolean kill_bochs_request; - - // for accessing registers by index number - Bit16u *_16bit_base_reg[8]; -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/ctrl_xfer16.cc wxclean/cpu/ctrl_xfer16.cc ---- clean-1.4.pre2/cpu/ctrl_xfer16.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/ctrl_xfer16.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: ctrl_xfer16.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: ctrl_xfer16.cc,v 1.5.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/ctrl_xfer32.cc wxclean/cpu/ctrl_xfer32.cc ---- clean-1.4.pre2/cpu/ctrl_xfer32.cc Tue Mar 5 10:52:26 2002 -+++ wxclean/cpu/ctrl_xfer32.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: ctrl_xfer32.cc,v 1.8 2002/02/22 05:33:36 yakovlev Exp $ -+// $Id: ctrl_xfer32.cc,v 1.5.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/ctrl_xfer8.cc wxclean/cpu/ctrl_xfer8.cc ---- clean-1.4.pre2/cpu/ctrl_xfer8.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/ctrl_xfer8.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: ctrl_xfer8.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: ctrl_xfer8.cc,v 1.5.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/ctrl_xfer_pro.cc wxclean/cpu/ctrl_xfer_pro.cc ---- clean-1.4.pre2/cpu/ctrl_xfer_pro.cc Sat Nov 10 18:00:56 2001 -+++ wxclean/cpu/ctrl_xfer_pro.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: ctrl_xfer_pro.cc,v 1.10 2001/11/10 23:00:55 bdenney Exp $ -+// $Id: ctrl_xfer_pro.cc,v 1.7.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/data_xfer16.cc wxclean/cpu/data_xfer16.cc ---- clean-1.4.pre2/cpu/data_xfer16.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/data_xfer16.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: data_xfer16.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: data_xfer16.cc,v 1.5.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/data_xfer32.cc wxclean/cpu/data_xfer32.cc ---- clean-1.4.pre2/cpu/data_xfer32.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/data_xfer32.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: data_xfer32.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: data_xfer32.cc,v 1.5.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/data_xfer8.cc wxclean/cpu/data_xfer8.cc ---- clean-1.4.pre2/cpu/data_xfer8.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/data_xfer8.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: data_xfer8.cc,v 1.5 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: data_xfer8.cc,v 1.4.4.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/debugstuff.cc wxclean/cpu/debugstuff.cc ---- clean-1.4.pre2/cpu/debugstuff.cc Tue Oct 9 17:15:14 2001 -+++ wxclean/cpu/debugstuff.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: debugstuff.cc,v 1.11 2001/10/09 21:15:14 bdenney Exp $ -+// $Id: debugstuff.cc,v 1.7.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/decode16.cc wxclean/cpu/decode16.cc ---- clean-1.4.pre2/cpu/decode16.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/decode16.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: decode16.cc,v 1.5 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: decode16.cc,v 1.4.4.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/decode32.cc wxclean/cpu/decode32.cc ---- clean-1.4.pre2/cpu/decode32.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/decode32.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: decode32.cc,v 1.5 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: decode32.cc,v 1.4.4.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/exception.cc wxclean/cpu/exception.cc ---- clean-1.4.pre2/cpu/exception.cc Sun Mar 17 04:16:28 2002 -+++ wxclean/cpu/exception.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: exception.cc,v 1.9 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: exception.cc,v 1.8.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/fetchdecode.cc wxclean/cpu/fetchdecode.cc ---- clean-1.4.pre2/cpu/fetchdecode.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/fetchdecode.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: fetchdecode.cc,v 1.7 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: fetchdecode.cc,v 1.6.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/flag_ctrl.cc wxclean/cpu/flag_ctrl.cc ---- clean-1.4.pre2/cpu/flag_ctrl.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/flag_ctrl.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: flag_ctrl.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: flag_ctrl.cc,v 1.5.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/flag_ctrl_pro.cc wxclean/cpu/flag_ctrl_pro.cc ---- clean-1.4.pre2/cpu/flag_ctrl_pro.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/flag_ctrl_pro.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: flag_ctrl_pro.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: flag_ctrl_pro.cc,v 1.5.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/init.cc wxclean/cpu/init.cc ---- clean-1.4.pre2/cpu/init.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/init.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: init.cc,v 1.14 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: init.cc,v 1.10.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -@@ -50,7 +50,7 @@ - - void BX_CPU_C::init(BX_MEM_C *addrspace) - { -- BX_DEBUG(( "Init $Id: init.cc,v 1.14 2001/10/03 13:10:37 bdenney Exp $")); -+ BX_DEBUG(( "Init $Id: init.cc,v 1.10.2.1 2002/03/17 08:57:01 bdenney Exp $")); - // BX_CPU_C constructor - BX_CPU_THIS_PTR set_INTR (0); - #if BX_SUPPORT_APIC -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/io.cc wxclean/cpu/io.cc ---- clean-1.4.pre2/cpu/io.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/io.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: io.cc,v 1.5 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: io.cc,v 1.4.4.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/io_pro.cc wxclean/cpu/io_pro.cc ---- clean-1.4.pre2/cpu/io_pro.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/io_pro.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: io_pro.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: io_pro.cc,v 1.5.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/lazy_flags.cc wxclean/cpu/lazy_flags.cc ---- clean-1.4.pre2/cpu/lazy_flags.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/lazy_flags.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: lazy_flags.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: lazy_flags.cc,v 1.5.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/lazy_flags.h wxclean/cpu/lazy_flags.h ---- clean-1.4.pre2/cpu/lazy_flags.h Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/lazy_flags.h Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: lazy_flags.h,v 1.3 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: lazy_flags.h,v 1.2.8.1 2002/03/17 08:50:39 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/logical16.cc wxclean/cpu/logical16.cc ---- clean-1.4.pre2/cpu/logical16.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/logical16.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: logical16.cc,v 1.5 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: logical16.cc,v 1.4.4.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/logical32.cc wxclean/cpu/logical32.cc ---- clean-1.4.pre2/cpu/logical32.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/logical32.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: logical32.cc,v 1.5 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: logical32.cc,v 1.4.4.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/logical8.cc wxclean/cpu/logical8.cc ---- clean-1.4.pre2/cpu/logical8.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/logical8.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: logical8.cc,v 1.5 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: logical8.cc,v 1.4.4.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/mult16.cc wxclean/cpu/mult16.cc ---- clean-1.4.pre2/cpu/mult16.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/mult16.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: mult16.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: mult16.cc,v 1.5.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/mult32.cc wxclean/cpu/mult32.cc ---- clean-1.4.pre2/cpu/mult32.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/mult32.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: mult32.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: mult32.cc,v 1.5.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/mult8.cc wxclean/cpu/mult8.cc ---- clean-1.4.pre2/cpu/mult8.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/mult8.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: mult8.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: mult8.cc,v 1.5.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/paging.cc wxclean/cpu/paging.cc ---- clean-1.4.pre2/cpu/paging.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/paging.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: paging.cc,v 1.8 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: paging.cc,v 1.6.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/proc_ctrl.cc wxclean/cpu/proc_ctrl.cc ---- clean-1.4.pre2/cpu/proc_ctrl.cc Sun Nov 18 11:32:40 2001 -+++ wxclean/cpu/proc_ctrl.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: proc_ctrl.cc,v 1.17 2001/11/18 16:32:40 bdenney Exp $ -+// $Id: proc_ctrl.cc,v 1.11.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/protect_ctrl.cc wxclean/cpu/protect_ctrl.cc ---- clean-1.4.pre2/cpu/protect_ctrl.cc Tue Oct 9 17:15:14 2001 -+++ wxclean/cpu/protect_ctrl.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: protect_ctrl.cc,v 1.10 2001/10/09 21:15:14 bdenney Exp $ -+// $Id: protect_ctrl.cc,v 1.7.2.1 2002/03/17 08:57:01 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/protect_ctrl_pro.cc wxclean/cpu/protect_ctrl_pro.cc ---- clean-1.4.pre2/cpu/protect_ctrl_pro.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/protect_ctrl_pro.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: protect_ctrl_pro.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: protect_ctrl_pro.cc,v 1.5.2.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/resolve16.cc wxclean/cpu/resolve16.cc ---- clean-1.4.pre2/cpu/resolve16.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/resolve16.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: resolve16.cc,v 1.5 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: resolve16.cc,v 1.4.4.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/resolve32.cc wxclean/cpu/resolve32.cc ---- clean-1.4.pre2/cpu/resolve32.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/resolve32.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: resolve32.cc,v 1.5 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: resolve32.cc,v 1.4.4.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/segment_ctrl.cc wxclean/cpu/segment_ctrl.cc ---- clean-1.4.pre2/cpu/segment_ctrl.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/segment_ctrl.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: segment_ctrl.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: segment_ctrl.cc,v 1.5.2.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/segment_ctrl_pro.cc wxclean/cpu/segment_ctrl_pro.cc ---- clean-1.4.pre2/cpu/segment_ctrl_pro.cc Tue Nov 13 00:11:42 2001 -+++ wxclean/cpu/segment_ctrl_pro.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: segment_ctrl_pro.cc,v 1.11 2001/11/13 05:11:41 bdenney Exp $ -+// $Id: segment_ctrl_pro.cc,v 1.6.2.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/shift16.cc wxclean/cpu/shift16.cc ---- clean-1.4.pre2/cpu/shift16.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/shift16.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: shift16.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: shift16.cc,v 1.5.2.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/shift32.cc wxclean/cpu/shift32.cc ---- clean-1.4.pre2/cpu/shift32.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/shift32.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: shift32.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: shift32.cc,v 1.5.2.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/shift8.cc wxclean/cpu/shift8.cc ---- clean-1.4.pre2/cpu/shift8.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/shift8.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: shift8.cc,v 1.5 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: shift8.cc,v 1.4.4.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/soft_int.cc wxclean/cpu/soft_int.cc ---- clean-1.4.pre2/cpu/soft_int.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/soft_int.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: soft_int.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: soft_int.cc,v 1.5.2.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/stack16.cc wxclean/cpu/stack16.cc ---- clean-1.4.pre2/cpu/stack16.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/stack16.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: stack16.cc,v 1.7 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: stack16.cc,v 1.6.2.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/stack32.cc wxclean/cpu/stack32.cc ---- clean-1.4.pre2/cpu/stack32.cc Tue Mar 5 10:52:26 2002 -+++ wxclean/cpu/stack32.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: stack32.cc,v 1.8 2002/03/05 15:50:17 bdenney Exp $ -+// $Id: stack32.cc,v 1.6.2.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/stack_pro.cc wxclean/cpu/stack_pro.cc ---- clean-1.4.pre2/cpu/stack_pro.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/stack_pro.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: stack_pro.cc,v 1.6 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: stack_pro.cc,v 1.5.2.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/string.cc wxclean/cpu/string.cc ---- clean-1.4.pre2/cpu/string.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/cpu/string.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: string.cc,v 1.5 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: string.cc,v 1.4.4.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/tasking.cc wxclean/cpu/tasking.cc ---- clean-1.4.pre2/cpu/tasking.cc Sat Nov 10 23:57:06 2001 -+++ wxclean/cpu/tasking.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: tasking.cc,v 1.9 2001/11/11 04:57:05 bdenney Exp $ -+// $Id: tasking.cc,v 1.5.2.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/cpu/vm8086.cc wxclean/cpu/vm8086.cc ---- clean-1.4.pre2/cpu/vm8086.cc Tue Mar 5 10:52:26 2002 -+++ wxclean/cpu/vm8086.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: vm8086.cc,v 1.9 2002/03/01 17:27:25 bdenney Exp $ -+// $Id: vm8086.cc,v 1.5.2.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/debug/crc.cc wxclean/debug/crc.cc ---- clean-1.4.pre2/debug/crc.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/debug/crc.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: crc.cc,v 1.2 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: crc.cc,v 1.1.10.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // I grabbed these CRC routines from the following source: -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/debug/dbg_main.cc wxclean/debug/dbg_main.cc ---- clean-1.4.pre2/debug/dbg_main.cc Sun Mar 17 04:16:28 2002 -+++ wxclean/debug/dbg_main.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: dbg_main.cc,v 1.37 2002/02/15 22:58:06 yakovlev Exp $ -+// $Id: dbg_main.cc,v 1.18.2.2 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -@@ -285,7 +285,7 @@ - BX_ERROR(( "%s: -rc option used, but no path specified.", - argv[0] )); - bx_dbg_usage(); -- exit(1); -+ BX_EXIT(1); - } - strncpy(bx_debug_rc_fname, argv[2], BX_MAX_PATH-1); - i += 2; // skip past "-rc" and filename -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/debug/debug.h wxclean/debug/debug.h ---- clean-1.4.pre2/debug/debug.h Sun Mar 17 04:16:28 2002 -+++ wxclean/debug/debug.h Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: debug.h,v 1.10 2001/11/28 18:37:12 instinc Exp $ -+// $Id: debug.h,v 1.4.4.1 2002/03/17 08:51:20 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/debug/lexer.c wxclean/debug/lexer.c ---- clean-1.4.pre2/debug/lexer.c Wed Nov 28 13:40:02 2001 -+++ wxclean/debug/lexer.c Sun Mar 17 04:12:50 2002 -@@ -19,7 +19,7 @@ - /* A lexical scanner generated by flex */ - - /* Scanner skeleton version: -- * $Header: /cvsroot/bochs/bochs/debug/lexer.c,v 1.9 2001/11/28 18:40:02 instinc Exp $ -+ * $Header: /cvsroot/bochs/bochs/debug/lexer.c,v 1.5.4.1 2002/03/17 08:51:20 bdenney Exp $ - */ - - #define FLEX_SCANNER -@@ -601,7 +601,7 @@ - #define INITIAL 0 - #line 2 "lexer.l" - ///////////////////////////////////////////////////////////////////////// --// $Id: lexer.c,v 1.9 2001/11/28 18:40:02 instinc Exp $ -+// $Id: lexer.c,v 1.5.4.1 2002/03/17 08:51:20 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - - #include -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/debug/lexer.l wxclean/debug/lexer.l ---- clean-1.4.pre2/debug/lexer.l Wed Nov 28 13:39:20 2001 -+++ wxclean/debug/lexer.l Sun Mar 17 04:12:50 2002 -@@ -1,6 +1,6 @@ - %{ - ///////////////////////////////////////////////////////////////////////// --// $Id: lexer.l,v 1.8 2001/11/28 18:39:19 instinc Exp $ -+// $Id: lexer.l,v 1.4.4.1 2002/03/17 08:51:20 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - - #include -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/debug/linux.cc wxclean/debug/linux.cc ---- clean-1.4.pre2/debug/linux.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/debug/linux.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: linux.cc,v 1.4 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: linux.cc,v 1.3.2.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - #include -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/debug/linux.h wxclean/debug/linux.h ---- clean-1.4.pre2/debug/linux.h Wed Oct 3 09:10:38 2001 -+++ wxclean/debug/linux.h Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: linux.h,v 1.3 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: linux.h,v 1.2.4.1 2002/03/17 08:51:20 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/debug/loader_misc.h wxclean/debug/loader_misc.h ---- clean-1.4.pre2/debug/loader_misc.h Wed Oct 3 09:10:38 2001 -+++ wxclean/debug/loader_misc.h Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: loader_misc.h,v 1.3 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: loader_misc.h,v 1.2.8.1 2002/03/17 08:51:20 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/debug/parser.y wxclean/debug/parser.y ---- clean-1.4.pre2/debug/parser.y Wed Nov 28 13:35:22 2001 -+++ wxclean/debug/parser.y Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: parser.y,v 1.6 2001/11/28 18:35:21 instinc Exp $ -+// $Id: parser.y,v 1.2.4.1 2002/03/17 08:51:20 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - - %{ -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/debug/sim2.cc wxclean/debug/sim2.cc ---- clean-1.4.pre2/debug/sim2.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/debug/sim2.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: sim2.cc,v 1.3 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: sim2.cc,v 1.2.8.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/debug/syscalls-linux.h wxclean/debug/syscalls-linux.h ---- clean-1.4.pre2/debug/syscalls-linux.h Wed Oct 3 09:10:38 2001 -+++ wxclean/debug/syscalls-linux.h Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: syscalls-linux.h,v 1.3 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: syscalls-linux.h,v 1.2.4.1 2002/03/17 08:51:20 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - ////////////////////////////////////////////////////////////////////////////// -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/disasm/dis_decode.cc wxclean/disasm/dis_decode.cc ---- clean-1.4.pre2/disasm/dis_decode.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/disasm/dis_decode.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: dis_decode.cc,v 1.8 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: dis_decode.cc,v 1.6.2.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/disasm/dis_groups.cc wxclean/disasm/dis_groups.cc ---- clean-1.4.pre2/disasm/dis_groups.cc Wed Oct 3 09:10:38 2001 -+++ wxclean/disasm/dis_groups.cc Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: dis_groups.cc,v 1.3 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: dis_groups.cc,v 1.2.8.1 2002/03/17 08:57:02 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/disasm/disasm.h wxclean/disasm/disasm.h ---- clean-1.4.pre2/disasm/disasm.h Wed Oct 3 09:10:38 2001 -+++ wxclean/disasm/disasm.h Sun Mar 17 04:12:50 2002 -@@ -1,5 +1,5 @@ - ///////////////////////////////////////////////////////////////////////// --// $Id: disasm.h,v 1.5 2001/10/03 13:10:37 bdenney Exp $ -+// $Id: disasm.h,v 1.4.4.1 2002/03/17 08:51:20 bdenney Exp $ - ///////////////////////////////////////////////////////////////////////// - // - // Copyright (C) 2001 MandrakeSoft S.A. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/doc/docbook/Makefile wxclean/doc/docbook/Makefile ---- clean-1.4.pre2/doc/docbook/Makefile Wed Mar 6 12:05:58 2002 -+++ wxclean/doc/docbook/Makefile Sun Mar 17 04:12:50 2002 -@@ -1,6 +1,6 @@ - ################################################################### - # doc/docbook/Makefile --# $Id: Makefile,v 1.7 2002/03/06 15:46:16 bdenney Exp $ -+# $Id: Makefile,v 1.5.2.1 2002/03/17 08:51:20 bdenney Exp $ - # - # Builds documentation in various formats from SGML source, and - # allows easy update to the Bochs web site. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/doc/docbook/Makefile.jade wxclean/doc/docbook/Makefile.jade ---- clean-1.4.pre2/doc/docbook/Makefile.jade Tue Sep 25 15:29:28 2001 -+++ wxclean/doc/docbook/Makefile.jade Sun Mar 17 04:12:50 2002 -@@ -1,6 +1,6 @@ - ################################################################### - # doc/docbook/Makefile --# $Id: Makefile.jade,v 1.1 2001/09/25 19:29:28 bdenney Exp $ -+# $Id: Makefile.jade,v 1.1.4.1 2002/03/17 08:51:20 bdenney Exp $ - # - # Builds documentation in various formats from SGML source, and - # allows easy update to the Bochs web site. -diff -urN -x *CVS* -x *patches* clean-1.4.pre2/doc/docbook/development/development.dbk wxclean/doc/docbook/development/development.dbk ---- clean-1.4.pre2/doc/docbook/development/development.dbk Sat Nov 17 12:15:38 2001 -+++ wxclean/doc/docbook/development/development.dbk Sun Mar 17 04:12:50 2002 -@@ -1,7 +1,7 @@ -