Stanislav Shwartsman
be4b73c6d2
extracted tlb specific code to tlb.h; extracted xsave cpuid leaf function to base cpuid class
2015-09-21 13:16:17 +00:00
Stanislav Shwartsman
c8cf4f956d
fix halt cpu indication from debugger
2015-09-14 19:17:20 +00:00
Stanislav Shwartsman
0d79c5f986
Implemented Page Modification Logging VMX feature
2015-05-06 19:55:44 +00:00
Stanislav Shwartsman
0917d12e8b
memory type report for physical accesses and RMW acccesses. todo: consider also pat
2015-02-22 21:26:26 +00:00
Stanislav Shwartsman
7a3e340e6d
implement memory type calculation by mtrr. todo: memory type from page tables
2015-02-20 21:50:59 +00:00
Stanislav Shwartsman
e16c6eb30c
preparations and interface definition for memory type support
2015-02-19 20:23:08 +00:00
Stanislav Shwartsman
b5a603c8c7
fixed %d->%u format found by cppcheck (patch by Maxim Derbasov)
2015-01-25 21:24:13 +00:00
Stanislav Shwartsman
055da948a0
fixed problems found by cppcheck tool (patch by Maxim Derbasov) - second round
2015-01-07 16:17:40 +00:00
Stanislav Shwartsman
1f4d3e7194
fixed problems found by cppcheck tool (patch by Maxim Derbasov)
2015-01-03 13:53:52 +00:00
Volker Ruppert
5abc3e647f
Fixed some MSVC warnings in the debugger code.
2014-12-23 11:53:35 +00:00
Volker Ruppert
2ec57b8a6b
Fixed some more C++11 warnings.
2014-12-18 17:52:40 +00:00
Stanislav Shwartsman
1924780b06
added ability to dump Bochs param tree in XML format
2014-11-15 22:03:52 +00:00
Stanislav Shwartsman
29efae3be3
adjust (c) in several files
2014-08-31 20:05:25 +00:00
Stanislav Shwartsman
6db61bedb1
compilation fixes with debugger enabled
2014-08-31 19:29:53 +00:00
Stanislav Shwartsman
b6147d9de8
fixed debugger enabled code
2014-08-31 18:48:04 +00:00
Volker Ruppert
cdd481bec1
Updated generated parser.* files
2014-08-04 18:27:49 +00:00
Stanislav Shwartsman
12bee4438f
corrently support 'show all' debugger command
2014-08-02 19:43:05 +00:00
Stanislav Shwartsman
baa6498edf
improved show debugger command help message
2014-08-02 19:39:26 +00:00
Stanislav Shwartsman
1f299b230f
show dbg-all and dbg-none re-anabled with slight syntax change: as dbg_all and dbg_none
2014-08-02 19:30:49 +00:00
Stanislav Shwartsman
8fbf673295
fixed compilation errors with FPU off
2014-04-29 18:49:38 +00:00
Stanislav Shwartsman
188dfc2ebe
added missing printf arguments
2014-04-20 05:58:11 +00:00
Stanislav Shwartsman
09414f2f4b
implemented access to opmask AVX-512 registers from debugger, fixed enhdbg buffer overflow with EVEX enabled
2014-02-11 20:51:18 +00:00
Stanislav Shwartsman
3798ed66b5
new function for disasm. todo: support it independently of CPU
2014-01-26 20:01:50 +00:00
Volker Ruppert
58019a1649
Renamed "ltdl.h" to "ltdl-bochs.h" to avoid conflicts with the include file
...
that is a part of the libtool package. Updated Makefile dependencies.
TODO: check if we can get rid of the ltdl*.* files (this would be possible if
the ltdl library is always available if libtool is present).
2013-12-17 19:57:40 +00:00
Stanislav Shwartsman
69c798bf29
fixed compilation warnings from gcc 4.8.1
2013-12-10 21:08:14 +00:00
Stanislav Shwartsman
085161ca49
more debugger fixes
2013-12-05 19:26:40 +00:00
Stanislav Shwartsman
ca2793ac76
Debugger: fixed param tree access to 64-bit variables (need to use get64() instead of get())
...
Debugger: if AVX-512 if not supported by current configuration do not print high256 of vector registers and zmm15..zmm31 in AVX command
Implement VBROADCASTF64x4, VBROADCASTF32x4, VBROADCASTFI64x4, VBROADCASTI32x4 AVX-512 instructions
Fetchdecode optimizations and bugfixes
2013-12-05 19:17:16 +00:00
Stanislav Shwartsman
79456eb7e1
Implemented VPCMP* AVX512 instructions
...
Implemented VMOVNTPS/PD/DQ AVX512 instructions
Implemented VMOVNTDQA AVX512 instruction
Bugfixes for AVX-512
2013-12-02 18:05:18 +00:00
Stanislav Shwartsman
4f158aef5f
Fixed 8-bit opmask read
...
Added opmask printout for AVX dump in dbg_main.cc
2013-12-01 20:50:01 +00:00
Stanislav Shwartsman
8602804086
another fix for commands debugger parser
2013-11-20 18:40:10 +00:00
Stanislav Shwartsman
acbf278346
allow device names with numbers in info device without quotes
2013-11-20 17:21:56 +00:00
Stanislav Shwartsman
ee40564a5f
remove unneeded vga keyword from lexer
2013-11-20 16:56:26 +00:00
Stanislav Shwartsman
ab87549b6b
Updates to Bochs debugger:
...
AVX command split into two: YMM command and ZMM command for AVX-256 and AVX-512.
Later new command AVX will be added whch will print complete AVX state according to what is defined currently, including OPMASK registers
info device <name>
and
info device <name> <string>
could be also used now without having to include device name in quotes as "name".
old style "qouted" option also still working
added missing info cpu command to the help
2013-11-19 21:53:55 +00:00
Stanislav Shwartsman
59af88ea50
fixed memory bug found by gcc 4.8.1 warning
2013-10-15 17:28:06 +00:00
Stanislav Shwartsman
2ec138f96e
Apply patch from developers mailing list:
...
bx_debug: allow expressions instead of numerals, where relevant
by Samium Gromoff
fix code duplication in fma handlers
2013-10-09 20:04:05 +00:00
Stanislav Shwartsman
09254eb474
avx512 implementation fixes and next steps
2013-10-08 18:31:18 +00:00
Stanislav Shwartsman
fd370a4d41
fixes in disasm, added example of using bxInstruction_c disasm into dbg_main.cc (commented out for now)
2013-10-05 19:32:09 +00:00
Stanislav Shwartsman
ba317a4ce1
fixed compilation when --enable-evex is ON
2013-08-24 18:28:09 +00:00
Stanislav Shwartsman
33a7063e60
bug fixes
2013-08-05 15:33:41 +00:00
Stanislav Shwartsman
2dbe81db51
first infrastructure changes to support EVEX prefix and AVX-512 extensions recently published by Intel
2013-07-26 12:50:56 +00:00
Stanislav Shwartsman
fd71b03353
add some definitions introduced in recent Intel SDM extensions document (rev015)
2013-07-23 20:51:52 +00:00
Stanislav Shwartsman
0c570ecb6a
clean symbols code a little
2013-06-26 18:07:01 +00:00
Volker Ruppert
ab57c1fb2f
found a better solution to fix the power_handler() deadlock
...
fixed bx_dbg_exit() handling for shutting down second simulation correctly
2013-02-20 18:51:39 +00:00
Volker Ruppert
7eda0feb6f
fixed some compiler warnings
2013-02-12 13:31:40 +00:00
Volker Ruppert
de4a5ecd79
fixed segfault when closing debugger gui window while simulation is running
2013-02-10 08:47:17 +00:00
Volker Ruppert
ecd07ae76b
update generated files
2013-01-28 17:53:50 +00:00
Stanislav Shwartsman
3ab0331307
implemented VMCS shadowing (Intel SDM rev045)
2013-01-21 19:55:00 +00:00
Stanislav Shwartsman
4bed791ccb
Added year 2013 to Copyright in all files already modified in new year
2013-01-19 20:45:03 +00:00
Stanislav Shwartsman
a8068812df
add 'tlb' command to debugger to do TLB lookup
2013-01-14 17:02:07 +00:00
Stanislav Shwartsman
29d5f4149b
correct typo
2012-11-07 04:41:30 +00:00
Stanislav Shwartsman
34b5044e06
added back set for compatibility
2012-11-06 20:10:32 +00:00
Stanislav Shwartsman
edf4ea4c74
fixed SF bug #1318 dbg: several issues with 'set' command
2012-11-06 20:01:02 +00:00
Volker Ruppert
9933ffa3d9
vga refresh framework changes
...
- renamed trigger_timer() methods to refresh_display()
- new argument 'redraw' added to force a refresh of the entire screen
(used in snapshot mode)
- siminterface method refresh_vga() now checks if the Bochs gui init is complete
- use SIM->refresh_vga() in some more cases
2012-10-28 08:23:39 +00:00
Stanislav Shwartsman
2ca0c6c677
Move INTR, Local APIC INTR and SVN VINTR into new event interface (hardest part)
...
Minor speedup (of 1-2%) was observed due to new implementation
Remove obsolete dbg_take_irq function and dbg_force_interrupt function from CPU code, the functions were not working properly anyway
2012-10-03 20:24:29 +00:00
Volker Ruppert
c2560a8d44
- fpu directory is now a subdirectory in 'cpu'
2012-09-12 21:08:40 +00:00
Stanislav Shwartsman
2f3c7ff8e4
implemented SMAP (Supervisor Mode Access Protection) from [Intel Architecture Instruction Set Extensions Programming Reference] rev14
...
fixed enabling of ADX extensions in generic CPUID when enabled through .bochsrc
Small code cleanups on the way to implementation of APIC Registers Virtualization features disclosed in recent Intel SDM rev043
2012-09-10 15:22:26 +00:00
Stanislav Shwartsman
f1fd44b2cf
preparations for apic regs virtualization feature described in SDM rev044
2012-09-06 15:21:08 +00:00
Volker Ruppert
5054b5f836
- generate parser / lexer files only if both flex and yacc are present and also
...
disable it if configuring for MSVC
2012-08-11 07:16:23 +00:00
Volker Ruppert
0f35b42429
- don't clean pcidev subdirectory if support is disabled
...
- check for flex presence and skip lexer.c generation if absent
2012-08-09 18:26:14 +00:00
Volker Ruppert
53438e92c6
- fixes based on Debian patches by Guillem Jover
...
- set SHELL variable with configure script
- add '--tag CXX' argument to libtool calls
2012-07-14 07:01:43 +00:00
Volker Ruppert
72d3b294d2
- added support for the gui debugger with sdl on Windows (required separate thread)
...
- enh_dbg: fixed defined-but-not-used warnings
- siminterface: renamed 'wx_debug_gui' to 'bx_debug_gui' and updated comments
- TODO: remove the wx debugger and use the enhanced gui debugger instead
2012-07-01 14:37:13 +00:00
Stanislav Shwartsman
04e46ee9b7
fixed typos caused compilation err
2012-06-28 18:34:28 +00:00
Stanislav Shwartsman
f12396566c
added CR8 to control registers print in debugger
2012-06-28 18:27:26 +00:00
Stanislav Shwartsman
42347a26ee
fixed dbg print format
2012-06-15 14:17:17 +00:00
Stanislav Shwartsman
720a9b2fb7
fixed 64-bit segment print from internal debugger
2012-06-14 18:56:47 +00:00
Stanislav Shwartsman
5192d09655
fixed some more valgrind issues
2012-06-04 18:46:07 +00:00
Stanislav Shwartsman
9d802e2762
very small cleanup
2012-05-05 18:40:37 +00:00
Volker Ruppert
bea07c65b1
- regenerated parser files
2012-04-24 17:50:41 +00:00
Volker Ruppert
a11e5713d7
- updated help texts
2012-04-24 17:48:38 +00:00
Stanislav Shwartsman
e1611e717e
Implemented feature request:
...
[3519794] debugger's ability to save physical/linear memory dumps
2012-04-24 11:01:59 +00:00
Volker Ruppert
6428ce38be
- updated generated lexer and parser files
2012-04-23 17:13:23 +00:00
Volker Ruppert
f65c4e66b8
- debugger command 'info device': implemented support for additional arguments
...
- ne2k: replaced debugger command 'info ne2k' completely by a new version based
on 'info device' with additional arguments and removed all of the now obsolete
stuff (ne2k device stub, macro for print_info())
- pci: added option 'dump=full' for the debugger command 'info device' to show
the whole PCI config space
- TODO: some other devices could have support for additional options in
debug_dump()
2012-04-23 17:06:19 +00:00
Volker Ruppert
bdfe4ae1bb
- added debug_dump() (prints the same as 'info ne2k' without arguments)
...
- removed FILE parameter from print_info() (unused - since dbg_printf() doesn't
need it)
- converted tabs to spaces
- TODO: implement 'info device' with optional arguments to get rid of the
print_info() method
2012-04-18 17:03:00 +00:00
Stanislav Shwartsman
077b691296
correctly fix SF #3516029 : bug stepping not working in debugger GUI in case of smp vm
...
reverted buggy SF patch #3502052 : Added refresh of debugger gui when stepping
re-generated bx_debugger lex/yacc files
2012-04-10 12:44:06 +00:00
Volker Ruppert
3027c108a8
- update generated files
2012-03-10 17:18:43 +00:00
Volker Ruppert
086266d033
- implemented new debugger command 'info device [string]' that shows the state
...
of the device specified in 'string'. Added register mechanism and chained
list to store the device name and pointer. Replace hardcoded debug info
implementations for pic, pci and vga by the new one.
- TODO #1 : improve existing debug_dump() output and add more devices
- TODO #2 : add support for additional arguments and replace the NE2k print_info()
2012-03-10 17:14:07 +00:00
Stanislav Shwartsman
56ff41bcd5
removed unused token from internal debugger command line parser
2012-01-24 21:42:04 +00:00
Stanislav Shwartsman
e42008a79a
fixed uninitialized variable usage
2012-01-23 16:51:00 +00:00
Stanislav Shwartsman
d69f845cc6
fixed compilation with debugger
2012-01-17 22:02:19 +00:00
Stanislav Shwartsman
644c7c6289
undo bxswap change - it breaks build with bx_debugger enabled. error - multiple definition of bx_swap16 in parser.o and lexer.o
2011-12-28 22:43:18 +00:00
Stanislav Shwartsman
7cd72d6f79
remove old garbage from makefile
2011-12-28 22:35:21 +00:00
Stanislav Shwartsman
bfcbb81602
SVM:
...
- IO intercept is not implemented yet
- MSR intercept is not implemented yet
VMX:
Fixed Bochs PANIC crash when doing I/O access crossing VMX I/O permission bitmaps.
This can happen because access_physical_read and access_physical_write cannot access memory cross 4K boundary.
2011-12-25 22:09:31 +00:00
Stanislav Shwartsman
fa7c225405
fixed typo - closing SF bug [3461405] step all command fails in SMP mode
2011-12-17 13:32:08 +00:00
Stanislav Shwartsman
76b742bd93
fixed timer breakpoint handling in internal debugger
2011-11-21 12:50:37 +00:00
Volker Ruppert
f5981e0ba2
- turn off the mouse capture when the internal debugger or gdbstub enter the input loop
...
- gdbstub: fixed compilation errors and warnings
2011-11-20 16:21:53 +00:00
Stanislav Shwartsman
d78ff1134d
fix for debugger creg command - correct fix this time
2011-11-18 12:56:33 +00:00
Stanislav Shwartsman
f6396de61e
fixed segfault in debugger creg command when xsave is disabled
2011-11-01 13:24:42 +00:00
Stanislav Shwartsman
b16d71175d
Fixed 'show off' command in internal debugger
...
Removed not working record/playback obsolete commands from internal debugger
2011-10-09 19:26:30 +00:00
Stanislav Shwartsman
03bcf7540a
print xcr0 together with cregs
2011-10-08 21:58:17 +00:00
Stanislav Shwartsman
aad57310c2
disasm for FMA4, better dbg print SSE rounding control with MXCSR
2011-10-06 20:33:10 +00:00
Stanislav Shwartsman
62d0c8abf7
- Now you could disable x86-64 from .bochsrc so now it is possible to emulate
...
32-bit CPU using Bochs binary compiled with x86-64 support.
The commit also fixes some init.cc issues with initialization of SYSCALL/SYSRET MSR in AMD hosts and also includes code reorg.
2011-09-25 17:36:20 +00:00
Stanislav Shwartsman
1b9f286945
- New way of CPUs scheduling in SMP mode brings up to 50% speedup to the
...
SMP emulation. New implementation uses dynamic CPU quantum value and takes
full advantage of the trace cache. Each emulated processor will execute
the whole trace before switching to the next processor.
* It is also safe to use large (up to 16 instructions) quantum values for
the SMP emulation now and improve performance even further.
The same merge also completely fixes SF bug :
[3312237] stepN command might be not working properly
Handlers chaining speedups are also supported with SMP emulation now.
2011-09-22 19:38:52 +00:00
Stanislav Shwartsman
b69f728246
Fixed internal debugger part of the bug:
...
#3312237 stepN command might be not working properly
The problem still can be exists for SMP.
2011-08-17 19:51:32 +00:00
Stanislav Shwartsman
a03e0266fb
added yonah CPUID to cpudb. remove bxversion.h from dep files
2011-08-16 19:58:56 +00:00
Stanislav Shwartsman
0bc93fdc59
added pentium mmx to cpudb. for now only can be enabled when cpu-level=5
2011-08-16 19:04:36 +00:00
Stanislav Shwartsman
e4513c727a
simplify some bochs internal dbg stuff
2011-08-11 19:40:51 +00:00
Stanislav Shwartsman
432bf97197
was playing with SMP and debugger
2011-07-09 22:17:16 +00:00
Stanislav Shwartsman
b14d962763
remove redundant flag
2011-06-01 20:44:40 +00:00
Stanislav Shwartsman
ee3f9e36cb
Implemented Supervisor Mode Execution Protection (SMEP)
2011-05-29 16:28:26 +00:00
Stanislav Shwartsman
2e6d8c09ed
update autogenerated files
2011-05-06 08:30:44 +00:00
Stanislav Shwartsman
4a7947f5e3
update autogenerated files
2011-05-06 08:29:23 +00:00
Stanislav Shwartsman
92bb77ef1d
Merge patch from SF tracker:
...
[3298173] Breakpoint on VMEXIT event by Jianan Hao
Patch description:
The patch provides a new command "vmexitbp" to set breakpoint when VM guest exit. The simulation will be stopped before first HOST mode instruction is executed.
Usage:
Type "vmexitbp" in debugger command window to switch it on/off (similar to modebp).
Currently, the patch has no corresponding interface on GUI debugger. Someone may add it if interested.
2011-05-06 08:19:03 +00:00
Stanislav Shwartsman
988ac41389
regen lex files
2011-05-02 17:20:38 +00:00
Volker Ruppert
c78026a9a2
- deleted executable properties from source files
2011-04-03 10:29:19 +00:00
Stanislav Shwartsman
7ced718040
implemented AVX instructions support
...
many changes - some cleanup will follow
please report ay found bugs !
2011-03-19 20:09:34 +00:00
Stanislav Shwartsman
16021a0ddb
rename model_specific.h to be cpuid.h
2011-03-19 17:35:18 +00:00
Stanislav Shwartsman
1aaf596d79
small fixes
2011-03-19 17:19:41 +00:00
Stanislav Shwartsman
ad536dd379
regenerated using latest tools
2011-03-04 20:35:24 +00:00
Stanislav Shwartsman
64a30a15fa
Adding Id and Rev property to all files
2011-02-25 20:16:02 +00:00
Stanislav Shwartsman
00981cd7a6
Adding Id and Rev property to all files
2011-02-24 22:05:47 +00:00
Stanislav Shwartsman
b20b08a3a3
better dbg print
2011-02-24 19:50:24 +00:00
Stanislav Shwartsman
b5ebe5865e
Fixes for incoming bug report, missed changes in CVS, repository fixups and etc
2011-02-11 09:56:23 +00:00
Volker Ruppert
44ece7cf26
- including vga.h in iodev.h no longer necessary and symbol NO_DEVICE_INCLUDES
...
is useless then
- updated makefile dependenies
2011-01-24 20:35:51 +00:00
Stanislav Shwartsman
1047acb2cc
rename SSE register param - prepare for wide SSE register (AVX)
2010-12-06 21:52:41 +00:00
Stanislav Shwartsman
91ac0df65c
implemented GS/FS BASE access instructions published in _319433-007.pdf document
2010-07-22 16:41:59 +00:00
Stanislav Shwartsman
2b1ea37252
verbose page command from debugger
2010-05-04 20:17:26 +00:00
Stanislav Shwartsman
df07dab80f
verbose phy mem access tracing
2010-04-13 17:56:50 +00:00
Stanislav Shwartsman
d39d485ece
changes variable name to better one
2010-04-03 05:59:07 +00:00
Stanislav Shwartsman
6d01eb5c1f
announce (not implement yet) PCID
2010-03-31 14:00:46 +00:00
Stanislav Shwartsman
01cfbdccbc
Move MMX to be runtime option
2010-03-01 18:53:53 +00:00
Stanislav Shwartsman
5df864b1f1
Move param_names.h into bochs root folder
2010-02-26 14:18:19 +00:00
Stanislav Shwartsman
84ba84ea9d
updates
2010-02-26 12:10:17 +00:00
Stanislav Shwartsman
033a20b3b2
allow to configure CPU features at runtime - implemened on example of SSE/AES/MOVBE/POPCNT
2010-02-25 22:04:31 +00:00
Stanislav Shwartsman
59963e8b4d
missed ;
2010-02-24 19:43:40 +00:00
Stanislav Shwartsman
8450728794
cleanup
2010-02-24 19:41:32 +00:00
Stanislav Shwartsman
d493e33659
print-stack fix
2010-01-10 14:11:53 +00:00
Stanislav Shwartsman
7495909597
fixed print-stack with 16-bit stack size (mem buffer overflow)
2010-01-09 20:28:07 +00:00
Stanislav Shwartsman
c67f6eddc7
Applied patch :
...
[2926072] Indirection operators in expressions by Derek Peschel
2010-01-05 13:59:08 +00:00
Stanislav Shwartsman
1c68cb8243
help dreg cmd fix
2009-12-30 19:20:27 +00:00
Stanislav Shwartsman
e8bf2b7785
regen files
2009-12-28 14:02:48 +00:00
Stanislav Shwartsman
fe687fd1a6
disasm displacements and offsets by default now printed as "relative" signed integers and not as unsigned offsets could toggle it back with disasm command.
...
help disasm in debugger
2009-12-28 13:52:40 +00:00
Stanislav Shwartsman
069ea6228e
disasm displacements and offsets by default now printed as "relative" signed integers and not as unsigned offsets
...
could toggle it back with disasm command.
help disasm in debugger
2009-12-28 13:44:32 +00:00
Stanislav Shwartsman
e59ff3d779
cleanup
2009-12-28 09:26:22 +00:00
Stanislav Shwartsman
d779842da3
added ability to modify sregs from bochs debugger
2009-12-27 16:38:09 +00:00
Stanislav Shwartsman
bd60e0264c
change Copyright to Bochs Project
2009-12-04 16:53:12 +00:00
Stanislav Shwartsman
b71eb23145
remove redundant stuff
2009-11-20 12:15:21 +00:00
Stanislav Shwartsman
27e3f6fda0
implemented range watchpoints - GUI debugger still can only do 1-byte length watches
2009-11-20 12:02:57 +00:00
Stanislav Shwartsman
6601f15c2e
first step for range watchpoints - code reorg
2009-11-19 21:28:25 +00:00
Stanislav Shwartsman
c4b9af631b
bugfix - gcc4 warning showed it :(
2009-11-12 21:06:41 +00:00
Stanislav Shwartsman
69fd6903c4
Fixed MSVCPP compilation error
2009-11-09 21:26:09 +00:00
Stanislav Shwartsman
9c9d8f66af
small fixes
2009-11-07 20:30:39 +00:00
Stanislav Shwartsman
ab1740b446
Fix in symbols
2009-11-07 20:07:04 +00:00
Stanislav Shwartsman
0fa41a33ea
style changes
2009-11-02 14:56:26 +00:00
Stanislav Shwartsman
e6da2ce8e8
updated docs and dbger help
2009-10-31 17:46:12 +00:00
Stanislav Shwartsman
98b51805d5
updates for Bochs debugger
2009-10-29 15:49:50 +00:00
Stanislav Shwartsman
22fa00831a
print if tss.base can't be translated to phy addr
2009-10-15 21:24:22 +00:00
Stanislav Shwartsman
a666532324
remove another unused function
2009-10-15 21:15:18 +00:00
Stanislav Shwartsman
3dbb1da68a
remove "dirty" pages tracking - it is too memory consuming and can fit with >4G phy addr space
2009-10-15 20:50:33 +00:00
Stanislav Shwartsman
c342a7700f
merge problem
2009-10-14 16:05:44 +00:00
Stanislav Shwartsman
2f95e032c3
print dr details
2009-10-14 14:56:01 +00:00