Merged with cmwdotme's github repo.

Maybe we can merge his further changes automatically now...

QEMU-README

@@ -0,0 +1,3 @@
+Read the documentation in qemu-doc.html.
+
+Fabrice Bellard.

QEMU-TODO

@@ -0,0 +1,37 @@
+General:
+-------
+- cycle counter for all archs
+- cpu_interrupt() win32/SMP fix
+- merge PIC spurious interrupt patch
+- warning for OS/2: must not use 128 MB memory (merge bochs cmos patch ?)
+- config file (at least for windows/Mac OS X)
+- update doc: PCI infos.
+- basic VGA optimizations
+- better code fetch
+- do not resize vga if invalid size.
+- TLB code protection support for PPC
+- disable SMC handling for ARM/SPARC/PPC (not finished)
+- see undefined flags for BTx insn
+- keyboard output buffer filling timing emulation
+- tests for each target CPU
+- fix all remaining thread lock issues (must put TBs in a specific invalid
+  state, find a solution for tb_flush()).
+
+ppc specific:
+------------
+- TLB invalidate not needed if msr_pr changes
+- enable shift optimizations ?
+
+linux-user specific:
+-------------------
+- remove threading support as it cannot work at this point
+- improve IPC syscalls
+- more syscalls (in particular all 64 bit ones, IPCs, fix 64 bit
+  issues, fix 16 bit uid issues)
+- use kernel traps for unaligned accesses on ARM ?
+
+
+lower priority:
+--------------
+- int15 ah=86: use better timing
+- use -msoft-float on ARM

README.txt

@@ -0,0 +1,30 @@
+how to compile:
+
+./configure --target-list=arm-softmmu --enable-sdl
+make
+
+How to run:
+
+./arm-softmmu/qemu-system-arm -M iphone2g -option-rom iBoot-1.0.2.m68ap.RELEASE -option-rom iphone1-bootrom.bin -pflash nordump.bin -serial stdio
+
+How do i contribute:
+
+Message me on twitter @cmwdotme and submit patches.
+
+Notes:
+
+This was done to help with the discovery and exploration of new exploits on
+the iPhone. The test was to see if we could emulate enough to get iBoot
+running then to try and get the kernel booting. The last step would be 
+trying to do a full restore via itunes.
+
+
+Credit:
+
+Thanks to Dre and iDroid guys specifically (Bluerise, ricky26, CPICH) for their help
+and of course thanks to comex/chpwn for their support and *motivation*
+
+p.s
+Chronicdev rocks
+
+

TODO

@@ -1,5 +1,6 @@
 General:
 -------
+<<<<<<< HEAD
 - cycle counter for all archs
 - cpu_interrupt() win32/SMP fix
 - merge PIC spurious interrupt patch
@@ -35,3 +36,12 @@ lower priority:
 --------------
 - int15 ah=86: use better timing
 - use -msoft-float on ARM
+=======
+- add nand support
+- fix usb
+- fix i2c/spi
+- boot kernel
+- Add iPhone3gs/iPad/iPhone4 support
+- ????
+- jailbreaks++
+>>>>>>> 3a2bc0331d4a9f25396fc9bbd3ef303e3ab9da7e

VERSION

@@ -1 +1,5 @@
+<<<<<<< HEAD
 0.14.50
+=======
+0.14.50-s5l89xx
+>>>>>>> 3a2bc0331d4a9f25396fc9bbd3ef303e3ab9da7e