update

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@568 c046a42c-6fe2-441c-8c8c-71466251a162

3 files changed, 20 insertions, 11 deletions

diff --git a/Changelog b/Changelog
index 9cddb49cc9..9952f363ae 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 version 0.5.2:
+
   - improved soft MMU speed (assembly functions and specializing)
   - improved multitasking speed by avoiding flushing TBs when
     switching tasks
@@ -15,6 +16,9 @@ version 0.5.2:
   - PowerPC system emulation update (Jocelyn Mayer)
   - PC floppy emulation and DMA fixes (Jocelyn Mayer)
   - polled mode for PIC (Jocelyn Mayer)
+  - fixed PTE dirty bit handling
+  - fixed xadd same reg bug
+  - fixed cmpxchg exception safeness
 
 version 0.5.1:
   
diff --git a/TODO b/TODO
index d483eb4d7f..9d7ed03f82 100644
--- a/TODO
+++ b/TODO
@@ -1,12 +1,12 @@
-before 0.5.2:
-------------
-
-- TLB code protection support
-- basic VGA optimizations
-- disable SMC handling for ARM/SPARC/PPC
-
 short term:
 ----------
+- XP install bug fix
+- L4 Pistachio kernel boot fix
+- TLB code protection support for PPC
+- add sysenter/sysexit and fxsr for L4 pistachio 686
+- basic VGA optimizations
+- disable SMC handling for ARM/SPARC/PPC
+- see undefined flags for BTx insn
 - user/kernel PUSHL/POPL in helper.c
 - keyboard output buffer filling timing emulation
 - verify tb_flush() with a20 and TLBs
diff --git a/qemu-doc.texi b/qemu-doc.texi
index c0a5bd048c..f4a69c272a 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -26,7 +26,7 @@ User mode emulation. In this mode, QEMU can launch Linux processes
 compiled for one CPU on another CPU. Linux system calls are converted
 because of endianness and 32/64 bit mismatches. The Wine Windows API
 emulator (@url{http://www.winehq.org}) and the DOSEMU DOS emulator
-(@url{www.dosemu.org}) are the main targets for QEMU.
+(@url{http://www.dosemu.org}) are the main targets for QEMU.
 
 @item 
 Full system emulation. In this mode, QEMU emulates a full
@@ -472,18 +472,23 @@ usage: qemu [options] [disk_image]
 
 General options:
 @table @option
+@item -fda file
+@item -fdb file
+Use @var{file} as floppy disk 0/1 image (@xref{disk_images}).
+
 @item -hda file
 @item -hdb file
 @item -hdc file
 @item -hdd file
-Use @var{file} as hard disk 0, 1, 2 or 3 image (@xref{disk_images}). 
+Use @var{file} as hard disk 0, 1, 2 or 3 image (@xref{disk_images}).
 
 @item -cdrom file
 Use @var{file} as CD-ROM image (you cannot use @option{-hdc} and and
 @option{-cdrom} at the same time).
 
-@item -boot [c|d]
-Boot on hard disk (c) or CD-ROM (d). Hard disk boot is the default.
+@item -boot [a|b|c|d]
+Boot on floppy (a, b), hard disk (c) or CD-ROM (d). Hard disk boot is
+the default.
 
 @item -snapshot
 Write to temporary files instead of disk image files. In this case,