View source
recovery
  • Contributors
    1. Loading...
Author Commit Message Date Builds
67 commits behind unified.
Alex
Recovery tool: serial flash dump support for DIGIC 5 models (tested in QEMU)
Alex
Portable startup code: fix error message with certain compilers: https://www.magiclantern.fm/forum/index.php?topic=13746.msg205494#msg205494
Alex
Recovery tool: boot flag enabler for DIGIC 7 (tested in QEMU)
Alex
cpuinfo: enabled DBGDSCR; debug register descriptions
Alex
cpuinfo: experimental debug register support for DIGIC 6 and 7 (to be tested: it might work or it might lock up)
Alex
cpuinfo: allow DIGIC 6/7 specific code (ARMv7 PMSA/VMSA) in the same binary
Alex
cpuinfo: allow both ARMv5 (DIGIC 2..5) and v7 (DIGIC 6 & 7) in the same binary
Alex
Recovery tool: allow changing printf font size at runtime (for cpuinfo and for future use)
Alex
Recovery tool: allow using CONFIG_BOOT_CPUINFO alongside with other options
Alex
Recovery tool: save a log file at the end, if the file wite stubs were used
Alex
Recovery tool: more verbose error handling
Alex
Recovery tool: fix SROM dumper initialization https://www.magiclantern.fm/forum/index.php?topic=17360.msg195513#msg195513 (tested in QEMU on 80D, 750D, 760D and 5D4)
Alex
asm.c: replaced find_func_called_after_string_ref with something more generic that can also scan backwards (find_func_called_near_string_ref)
Alex
Recovery tool: skip scanning the slow ROM when looking for ROMBASEADDR on DIGIC 7
Alex
Recovery tool: progress indicator for find_firmware_start; avoid unaligned memory access (DIGIC 7 appears to have a very slow ROM above 0xF0000000)
Alex
ROM layout: check for repeated byte as a special case, before recursivity (reduces stack usage for very large areas repeating the same byte over and over)
Alex
cpuinfo_v7: initial support for DIGIC 7 (incomplete, only what worked in QEMU from DIGIC 6)
Alex
Recovery tool: minor cleanups
Alex
Recovery tool: fine-tuned ROM layout autodetection - do not scan unused ranges that may result in lock-up - minor algorithm update
Alex
Recovery tool: moved model list at the top
Alex
prop_diag: fix scan range for DIGIC 6 (based on ROM layout autodetection results)
Alex
Recovery tool: ROM layout autodetection experiment To be tested on ALL models from DIGIC 2 to DIGIC 7 (and soon 8); might lock up on some of them.
Alex
Recovery tool: portable way to find ROMBASEADDR (tested on DIGIC 2 ... DIGIC 7 in QEMU)
Alex
disp_direct: fix display buffer size for 5D4
Alex
disp_direct: re-applied the uncacheable trick from 7dadc58 (likely the reason for blue screen on DIGIC 6) https://www.magiclantern.fm/forum/index.php?topic=17360.msg200622#msg200622
Alex
Recovery tool: allocate memory for serial flash in our BSS (to be tested; seems OK in QEMU)
Alex
disp_direct: allocate display buffers statically in our BSS Should fix conflicts with Canon code reusing the (previously hardcoded) memory on DIGIC 6/7. Should also fix booting on 1000D (only 64MB RAM).
Alex
Recovery tool: zero BSS (should fix issues with variables initialized to 0)
Alex
Recovery tool: experimental ROM dumper for DIGIC 7 (confirmed on 77D and 200D so far)
Alex
Recovery tool: initial support for DIGIC 7 - disp_direct: bootloader now runs Thumb code; display buffer register changed - ROM layout: 32MB at E0000000 + 16MB at F0000000, boot flags at 0xE1FF8000 - polyglot startup code to autodetect whether we were loaded as ARM or as Thumb (D7 loads autoexec.bin as Thumb) - ROM dumping not working yet, but display confirmed working on 77D - display gets initialized on M50 (DIGIC 8), but doesn't show an…
Alex
Recovery tool: added recent models
Alex
disp_direct: undo 7dadc58; to be tested (sombree reported it's no longer necessary)
Alex
Recovery tool: portable cache disabling for ROM dumper (to be tested)
Alex
arm-mcr.h: adapted DIGIC 6 cache routines from digic6-dumper branch (commmits cca4a72, 0f83f3b, 9ec2b64, f492292, d3b5ec9, f6e763a)
Alex
Recovery tool: enable the shareable bit on main memory for DIGIC 6 (to be tested)
Alex
Recovery tool: no need to run under uncacheable memory it doesn't help, as Canon code still allocates a cacheable buffer for file I/O https://www.magiclantern.fm/forum/index.php?topic=16534.msg170417#msg170417
Alex
prop_diag: fix warnings; do not print user name by default
Alex
Serial flash dumper: further cleanups, stub autodetection for D6 models (tested on 80D, 750D, 760D and 5D4 in QEMU)
Alex
asm.c: debug messages for QEMU
Alex
Merged qemu into recovery (for debugging with CONFIG_QEMU)
Alex
QEMU: removed unused entries; moved ML helpers to a different GPIO range. Old range was not accessible on certain models, such as PowerShots and DIGIC 7. Old GPIOs are still accepted (debugging existing code from experimental branches is still possible without merging latest qemu).
Alex
QEMU logging: -d romcpy now output a shell script for extracting the copied blocks
t3r4n
initial attempts for a serial flash dumping routine (squashed from https://bitbucket.org/t3r4n/magic-lantern/branch/sf_dump_trial )
Alex
Makefile: made printing build info optional to fix compiling from platform/portable.000
Alex
QEMU: memfd patch to fix compilation with glibc 2.27 https://patchwork.openembedded.org/patch/147682/
Alex
QEMU installer: minor updates - option to "make clean" before renaming the old folder (to save disk space) - exit if QEMU fails to compile - check for a valid DISPLAY (important for WSL) - updated help links
Alex
Merged unified into recovery
Alex
disp_direct: fix vertical scrolling (should have been included in e3a406f)
Alex
QEMU: updated CPU definition for DIGIC 7; renamed for older models and reverted the HIVECS property back to false
Alex
QEMU tests: updated checksums for EOS M/M2 screenshots displaying date/time (fix commit 8c575ef99b7f)
Alex
QEMU tests: updated checksum for a screenshot affected by transparency - commit 5b274e3 (Canon quirk - it's not even a LiveView screenshot)
Alex
annotate_mpu_log.py: allow incomplete mpu_send/recv lines (such as the ones from 80D logs)
Alex
MPU spells: documented some AF-related properties
Alex
GDB scripts: also identify and name PTP handlers
Alex
GDB scripts: identify named functions during execution and export as IDC Named functions identified from: task_create, register_func, register_interrupt, CreateStateObject Tested on 5D3 1.1.3, EOSM2 1.0.3 and 80D 1.0.2 (missing stubs added).
Alex
QEMU: check whether the ROM contents are mirrored (whether dumped size is larger than actual ROM size) ``` [EOS] loading './50D/ROM0.BIN' to 0xF0000000-0xF0FFFFFF [EOS] mirrored data; unique 0x400000 bytes repeated 0x4 times [EOS] loading './50D/ROM1.BIN' to 0xF8000000-0xF8FFFFFF [EOS] mirrored data; unique 0x800000 bytes repeated 0x2 times ``` https://www.magiclantern.fm/forum/index.php?topic=2864.msg199837#msg199837
Alex
QEMU: SRM_SetBusy/ClearBusy emulation for 5D3/6D/70D
Alex
annotate_mpu_log.py: mark unknown MPU messages with ??? (this ensures all MPU messages are displayed to the terminal, including unknown ones)
Alex
Menu: QEMU hack 90f702c no longer needed for EOS M/M2 (keeping changes to gui.h and button_codes.h)
Alex
run_canon_fw.sh: fix printing GDB command line on systems where process name is limited to 15 chars; only look at processes started by the same parent as this script (to avoid false positives) to be tested on Mac and WSL
Alex
QEMU: EOS M and M2 appear to handle the Q/SET button just like 100D https://www.magiclantern.fm/forum/index.php?topic=21765.msg198769#msg198769
Alex
QEMU: enabled MPU properties for EOS M (no more issues after LiveView emulation)
Alex
QEMU: allow any argument for PROP_LEO_LENSID (EOSM); documented PROP_LEO_LENS* Should fix emulation with ROMs saved with a different lens (apparently lens ID goes into ROM - property 0xC000004) https://www.magiclantern.fm/forum/index.php?topic=9741.msg198847#msg198847
Alex
QEMU: send PROP_LV_LENS message at initialization (5D3 1.1.3; 1.2.3 commented; the message is model-specific) Useful for LiveView emulation (display focal length, focus distance etc) Message sent in a different place (not as in the logs), as it interferes with our (broken) LiveView emulation
Alex
QEMU: experimental bitmap transparency support (doesn't match the hardware exactly, but it's better than nothing)
Alex
QEMU: experimental movie mode switch (V key) Some cameras have dedicated movie mode on the dial, others use a switch and can record video in any mode dial position.
Alex
QEMU: key mapping for Zoom In / Zoom Out (they don't do anything interesing yet); allow defining different keybindings on the same physical key (5D3/6D: only one zoom button, unlike most others) cleaned up zoom button handling on 5D3 and 6D (unpress zoom out should not be sent from keyboard, for example)
Alex
QEMU: fix copy/paste error in HPTimer emulation (no side effects)
Alex
QEMU tests: large timeouts appear to help in some tricky cases (such as mode switches, which may be slower than usual)
Alex
QEMU: updated GUI tests for LiveView. EOS M/M2: no more reason to start with the date/time dialog. Still some color palette issues; usually can be worked around by switching to other video mode and back. Minor call trace differences for 650D and 700D (missed from previous commit)
Alex
QEMU: LiveView works!!! (GUI elements only, no image) Credits go to Greg for the first PoC https://www.magiclantern.fm/forum/index.php?topic=2864.msg179867#msg179867 Tests not yet updated, just to check whether the implementation is really without side effects outside LV. Only one screenshot changed - on EOS M (that screenshot was already in LiveView). Note: 70D uses more EDMAC connections; increased number from 48 to 64.
Alex
MPU spells: identified some more properties while looking into the EOSM shutter bug https://www.magiclantern.fm/forum/index.php?topic=21728.0
Alex
QEMU: validate calls to eos_trigger_int allow missing UART RX/TX interrupt and just print a warning (affected: Eeko and EOS M5; fix not obvious)
Alex
QEMU: removed unnecessary assertion in interrupt controller (triggered very rarely under "normal" conditions, but happens very often with io_trace)
Alex
QEMU tests: run the GDB test for 10 seconds (these logs will be used for building the interrupt map)
Alex
QEMU: fix alignment of MMIO messages before starting tasks (-d io)
Alex
QEMU: fix HPTimer handling of periodic triggers (VxWorks models use a HPTimer as heartbeat, unlike DryOS) No visible differences on the UI, but heartbeat is now triggering on all VxWorks models. Minor emulation differences on 60D, 600D, 650D, 700D, 100D, EOSM, 6D (besides VxWorks models).
Alex
GDB scripts: EOSM.202 stubs for logging properties (related: af43d85)
Alex
annotate_mpu_log.py: fix handling logs with Windows newlines https://www.magiclantern.fm/forum/index.php?topic=21728.msg198330#msg198330
Alex
QEMU: delay EDMAC reads by one timer step (apparently reads are supposed to finish after writes) Change required to pass the memory benchmark on 5D3 and 6D. 700D gives the same error if writes are delayed. Minor changes to call/return trace on 60D, 600D, 1200D and 1300D (no visible effects).
Alex
QEMU tests: updated EOSM2 call/return trace for latest SFDATA.BIN from dfort (previously, SFDATA.BIN for 100D was assumed; no visible changes)
Alex
QEMU: declared silent control events for 5D3 (not used; only for annotations)
Alex
MPU spells: found PROP_LV_APERTURE and PROP_SILENT_CONTROL_STATUS
Alex
QEMU: declared internal zoom in/out events for 5D3 (they are sent by the MPU during GUI mode switches)
Alex
QEMU: fix LV button code for 5D3
Alex
annotate_mpu_log.py: more output options (to stdout, to file, auto rename)
Alex
MPU spells: script to annotate logs with mpu_send/recv events (known MPU messages moved to known_spells.py)
Alex
Makefile: fix "make install_qemu CONFIG_QEMU=y" for minimal targets
Alex
QEMU: workaround to emulate io_trace (without it, many MMIO events are missed, apparently because of QEMU's TLB cache)
Alex
NotifyBox: log messages to QEMU console
Alex
GDB scripts: replaced *(int*)(x) with MEM(x) (for consistency with other ML code, and maybe slightly easier to read)
Alex
QEMU: experimental Q button emulation for 100D (not 100% sure about it, but seems to emulate the long Q/SET press correctly)
Alex
run_ml_all_cams.sh: fix QEMU_DIR once more
Alex
run_ml_all_cams.sh: fix QEMU_DIR
Alex
Menu: hack to allow browsing ML menu on EOSM and EOSM2 (requires CONFIG_QEMU=y)
Alex
Merged makefile-updates into qemu (also updated README regarding "make install_qemu" on modules)
Alex
QEMU: moved default installation directory to qemu-eos Rationale: user is likely to have another qemu directory, unrelated to ML (such as the vanilla qemu repo) Can be changed by setting QEMU_DIR, e.g. "export QEMU_DIR=qemu" before running install.sh will install QEMU in the old path To be thoroughly tested.
Alex
QEMU: trim HTML logs to 10000 lines if higher (very slow to render; also, at these sizes, browsing/grepping plain text is way faster)
Alex
GDB scripts: logging hook for prop_deliver
Alex
GDB scripts: logging hooks for CreateStateObject useful to find all state objects created during the emulation http://www.magiclantern.fm/forum/index.php?topic=17969.msg196010#msg196010
Alex
QEMU installer: fine-tuned prompt when reinstalling
Alex
QEMU: fix Q button handling on 550D, 600D, 1100D (to be tested)
Alex
QEMU readme: table of contents; minor typos
Georg Hofstetter
QEMU readme: GPIO section update
Alex
dump_srec.py: updated to decode lens firmware updates (*.lfu) http://www.magiclantern.fm/forum/index.php?topic=20969
Alex
QEMU readme: misc updates (formatting, rephrasing); GPIO section
Alex
QEMU installer: make it clear the script expects user input when it's asking whether to compile QEMU
Daniel Fort
eject removes the disk image completely while unmount doesn't remove the disk image from /dev.
Georg Hofstetter
reworked description of the peripherals
Alex
QEMU install: fix mistakes
Alex
QEMU readme: typos, formatting
Alex
QEMU readme: note for Bitbucket not always rendering the RST (reloading the page usually works; apparently it doesn't need javascript, so what's going on?)
Alex
QEMU readme: some basic concepts related to how the DIGIC hardware works (some parts adapted from https://jsandler18.github.io/ )
Alex
QEMU readme: misc notes - tip to save SD images as qcow2 (they take less disk space) - instrumentation tools - history updates - minor formatting fixes
Alex
QEMU: use 600D MPU messages for 1300D fixes toggling drive mode, http://www.magiclantern.fm/forum/index.php?topic=17969.msg196013#msg196013
Alex
GDB scripts: hide warnings about undefined task addresses when running with patches.gdb (when running with debugmsg.gdb, full context info is printed)
Alex
GDB scripts: fix address in log_result (LR is no longer valid, as we are no longer at the beginning of a function call)
Alex
QEMU install.sh: recent git no longer accepts empty identities http://www.magiclantern.fm/forum/index.php?topic=20214.msg195892#msg195892
Alex
QEMU scripts: removed hardcoded references to ../magic-lantern and documented how the directories can be customized
Alex
QEMU readme: documented directory structure
Alex
QEMU logging: cleaned up hacks around memory logging options (logging tools may require any memory logging backends, but in the logs, only those items specifically requested by user will be printed)
Alex
run_canon_fw.sh: hide osascript messages on Mac (when trying to bring the QEMU window in foreground, but there isn't any)
Alex
QEMU install: keep the 64-bit gdb warning prompt on Mac and WSL (to be tested)
Alex
QEMU install: attempt to fix warnings about 64-bit gdb on Mac and WSL (to be tested) the script should print warnings about them, but accept them as valid
Alex
QEMU install: fix path issue after compilation
Alex
QEMU install: fix warning about lsb_release on Mac or other systems without it
Alex
QEMU install: attempt to fix warnings about 64-bit GDB on Mac (to be tested)
Alex
QEMU install: fine-tuned QEMU compilation, to be tested (error handling, display the next steps after compilation finished)
Alex
QEMU install: on WSL and Mac, try the latest 64-bit toolchain (to be tested) Linux installation still uses the 32-bit one (older version) TODO: attempt to compile a 32-bit GDB for Mac Reworded warnings, as a 32-bit GDB is now only needed for development; it's no longer mandatory for running the examples, since http://www.magiclantern.fm/forum/index.php?topic=2864.msg190823#msg190823
Alex
QEMU: simplified SFDMA mapping by removing model-specific redirection (they are fairly consistent across all models)
Alex
QEMU tests: 40D call trace still not fully deterministic (CF uses some status polling, not just DMA) re-applying workaround (only check the "basic" call trace, without function arguments and extra info)
Alex
QEMU: documented SD detect registers on recent DIGIC 5 models (non-functional)
Alex
QEMU: refactored CFDMA/UartDMA handling to remove model-specific redirections enabled UartDMA on all models (including VxWorks), but it's not working yet 70D: IFE DMA handling moved from SDDMA to CFDMA (minor, no noticeable side effects other than breaking the tests)
Alex
QEMU: fix 5D3 CF emulation (disabled by default; can be enabled from mpu_spells/5D3.h)
Alex
QEMU: documented property groups ("complex" MPU messages) including GDB logging hooks to find them
Alex
QEMU tests: relaxed shutdown checks (some false positives caused by non-deterministic emulation) (note: menu tests are executed non-determinstically, unlike the call trace, so each run is different)
Alex
QEMU: attempt to get deterministic execution on CF models when using -icount operations are slowed down to avoid timing variations default behavior (without -icount) is not affected on main firmware, the call/return trace test is now deterministic on all models! fixme: CF emulation in PIO mode is still non-deterministic
Alex
GDB scripts: generic logging hooks
Alex
QEMU readme: example of identifying the location of an assertion using gdb and -d callstack; minor updates
Alex
QEMU: updated 750D/760D GDB scripts and tests; file I/O works! (using 750D SFDATA.BIN)
Alex
Alex
QEMU: fix some MPU spells (typos caught by automated checking)
t3r4n
Added the serial flash line for 750D and 760D into model_list. See https://www.magiclantern.fm/forum/index.php?topic=17627.msg195357#msg195357
Alex
QEMU readme: minor link updates
Alex
QEMU readme: moved developer and reverse engineering notes to a new file (reason: bitbucket seems to have trouble rendering large files)
Alex
QEMU readme, GDB scripts: info on debugging symbols; more symbol-file choices in comments (depending on what you are debugging - regular ML, reboot shim or Canon firmware)
Alex
QEMU readme, GDB scripts: recommend '-ex quit' after patches.gdb, but not after debugmsg.gdb reason: when running with patches.gdb, you may not want to type "quit" after stopping the emulation however, this trick removes the ability to use interactive breakpoints in GDB (it would quit as soon as reaching one), so don't recommend it for debugmsg.gdb
Alex
QEMU readme: fix typos; minor updates
Alex
QEMU: fix serial flash DMA on DIGIC 6 (tested on 80D, 5D4 and 750D with PR #894); refactored serial flash to use its own DMA (not shared with SD)
Alex
QEMU: updated 80D test results for actual serial flash contents http://www.magiclantern.fm/forum/index.php?topic=17360.msg195519#msg195519
Alex
QEMU readme: formatting
Alex
QEMU readme: GDB scripting examples, including callstack
Alex
QEMU readme: use em-dashes instead of simple dashes
Alex
QEMU: changed I/O logging behavior - "-d io" implies "-d nochain -singlestep" (this prints correct PC values, but emulation is slower) - "-d io_quick" to get the old behavior (faster, with incorrect PC values) - "-d io_log" to print mmio_log entries for dm-spy-experiments - "-d nochain" always implies "-singlestep" (easier to enable this mode on other kind of logs that may need it) - updated README
Alex
QEMU readme: moved the "Incorrect firmware version" section to Hacking (it's no longer an issue for regular users)
Alex
QEMU readme: started to document the steps needed to emulate Canon GUI
Alex
QEMU readme: minor updates, corrections
Alex
QEMU tests: updated after changing the SD image - format screenshots slightly different at free space (before only) - call/return traces are also different (different layout on the SD image)
Alex
QEMU: updated sd.img.xz with latest portable display test (main change: fix identification of firmware version - 7889972)
Alex
GDB scripts: fix assert handling on EOS M10
Alex
QEMU: moved 7D2 patches to GDB scripts; initial GDB script for 7D2 slave
Alex
QEMU: defined FPGA memory regions for 5D2 and 50D (just to prevent some warnings; nothing changed in functionality)
Alex
QEMU tests: run all cleanups on CTRL-C (stop all background tasks, make sure QEMU is no longer running, remove temporary files...)
Alex
QEMU: enabled serial flash emulation on 5D4 (emulation on main firmware doesn't go that far, but can be tested from bootloader menu)
Alex
QEMU: refactored serial flash CS handling to reduce duplicate code (moved CS register and tested value to model_list.c)
Alex
QEMU tests: reworked menu tests (including format) - use vncexpect whenever the md5 of the next screen is known (reduces timing sensitivity and also faster overall) - no more wait hacks required for format tests - use a single vncdotool command whenever possible (faster) - removed duplicate code (function for sending a menu sequence) - fine-tuned progress indicator
Alex
MPU spells: allow changing various Canon properties that require confirmation from the MPU: ISO, shutter, aperture, EC, FEC, metering, drive, AF mode, picture style, WB, ExpSim, ALO, HTP, MLU all but WB were broken if changed from ML menu/scripts; they are working now (fixme: not included in tests) some of them were working from Canon UI before this patch (picture style, WB, ExpSim, metering and drive mode) WB was working before, but uses confirmation in logs; updated for consistency could not test on: 5D2, 40D, 50D, 550D, 650D, 700D, EOSM2 not working: EOSM (breaks previous tests => disabled)
Alex
QEMU: experimental mode dial emulation works on most models to some extent, except 40D, could not test on 550D, 650D, 70D, EOSM2
Alex
MPU spells: comment out possible mode switches not required for the GUI, but will interfere later with the mode switching feature affected models: 6D (call/return trace changed), 70D, 700D (no side effects noticed)
Alex
Merged in t3r4n/magic-lantern/qemu_installer (pull request #893) Further automation in install script to compile directly at the end.
Alex
QEMU: more MPU properties identified by brute-forcing
Alex
QEMU: formatting fixes in extract_init_spells.py / known_spells.h
Alex
QEMU: added property IDs to known MPU spells also alternate names as comments
Alex
QEMU: identified more MPU spells, corrected a few others - experimentally (playing around in menus) - brute-forcing MPU messages to identify properties - cross-checked names and IDs in startup logs and ROM strings - still, it's impossible not to find a few incorrect ones
Alex
QEMU: experiment - brute-force MPU messages to find out their meaning
Alex
GDB scripts: hooks for logging properties (prop_request_change, MPU property functions) (example for 5D3.113 and 550D.109; useful for identifying properties)
Alex
qemu-util: fix compilation in bootloader context; sample boot messages in reboot.c, e.g. printing firmware signature or RESTARTSTART address (only present in the output binary when compiling with CONFIG_QEMU=y)
Alex
GDB scripts: disable serial flash version check patch on EOS M2 not really needed (the error message seems harmless and doesn't prevent GUI emulation) but changed ML firmware signature checking and won't be needed after getting a serial flash dump from a real camera anyway
Alex
QEMU install.sh: further Ubuntu/WSL cleanups (minor)
Alex
QEMU install.sh: fine-tuned messages and date format when renaming an older installation
Alex
Merged in t3r4n/magic-lantern/qemu_install_improvement (pull request #892) Option to rename or delete existing QEMU directory during installation
Alex
QEMU install.sh: WSL fixes - checking for Ubuntu (uname -a does not report Ubuntu) - hide 32-bit toolchain options
Alex
run_canon_fw.sh: Mac fixes - use is_mounted (lsof checks are enough) - typo in osascript when trying to bring QEMU window to front
Alex
run_canon_fw.sh: fine-tuned checking of whether SD/CF image is in use - use lsof to detect whether another process opened the SD/CF image for writing - only allow multiple instances of QEMU if using -snapshot (read-only access to SD/CF image) - check all results returned by losetup (note: lsof does not show whether the image is mounted) - use alternate methods (grepping mount output) if losetup is not available - to be tested/refined on Mac and Windows 10 WSL
Alex
QEMU: RTC workaround to bring back 400D GUI (broken in 0d654a0, not covered by tests as it's very slow)
Alex
QEMU: 40D GUI working! - MPU RX register was read 8 bits at a time (other models so far used 16-bit reads) - using 50D MPU spells - button codes found with extract_button_codes.py, from existing ML port - HotPlug: external monitor, USB, Toe, erase switch - CFDMA: new channel, protocol tweaks, enabled interrupts - Powersave workaround (GUI locked up after some seconds of inactivity, similar to 1300D)
Alex
QEMU: fix USB CONNECT on 450D/1000D (incidentally, this also fixes the card format dialog on these cameras - likely UILock issue)
Alex
QEMU: 1300D GUI works! - this camera uses a different DryOS timer (totally unexpected!) - removed JPCORE patch (firmware expects this to be initialized properly) - generic MPU spells; button codes from 1100D - powersave workaround (without it, GUI would lock up after a few seconds of inactivity) - no patches required!
Alex
QEMU: cleaned up serial flash handling on models that don't use one previously, they were called on unrelated SIO/SDIO channels, with little or no side effects, other than breaking a few function call trace tests
Alex
QEMU: updated 80D tests for 1.0.2; DCIM test also works!
Alex
QEMU: 80D file I/O support from main firmware (experimental, tested with "dumpf" in the serial console)
Alex
QEMU: enable card support on generic MPU spells (experimental, some models work better than others)
Alex
GDB scripts: some experimental 80D patches, to be fixed in the emulation
Alex
GDB scripts: log state object transitions (stubs for 550D and 80D)
Alex
GDB scripts: 80D logging hooks for semaphores and message queues (disabled by default; also updated assert_log for 1.0.2)
Alex
QEMU: RomRead DMA is actually XDMAC (up to 4 channels; 80D only uses 2)
Alex
QEMU: experimental MPU support for 80D, 750D and 760D seems to work with generic spells - at least the emulation goes further also minor refactoring / comments on MPU registers for earlier models also enabled for 5D4 just to avoid a crash - emulation doesn't reach mpu_send yet, but it calls InitializeIntercom
Alex
QEMU tests: do not start if compilation fails (small nitpick that could result in false test results)
Alex
QEMU: updated tests after b75e1342711a (context info is now correctly printed when returning from msg_queue_receive, take_semaphore etc)
Alex
QEMU: generic MPU spells compatible with most EOS models (experimental)
Alex
QEMU logging: fix losing track of called functions when DryOS tasks are switched outside interrupts see the assertion error on 5D4 callstack consistency test (after 442b691) to be tested; there was a similar error was on 80D, non-deterministic (encountered when running with -d debugmsg,callstack,tail with all patches enabled)
Alex
QEMU: MPU status doesn't seem to matter much; simplified to prepare for DIGIC 6 compatibility todo: cross-check with actual hardware
Alex
QEMU: shared memory initialization for DIGIC 6 (MEMDIV messages) to try: SHM_SHOW_INFO / SHM_SHOW_DIST_INFO on serial console (only 80D, 750D and 760D reach this far) ( sleep 3; echo "akashimorino"; sleep 1; echo "SHM_SHOW_INFO"; sleep 1; echo "SHM_SHOW_DIST_INFO"; ) | ./run_canon_fw.sh 80D -serial stdio
Alex
QEMU: refactored serial flash SIO handler with io_log
Alex
QEMU: refactored serial flash connections to avoid hardcoding camera model names fixme: D3 models and 1300D still hardwired to serial flash handlers to pass the tests
Alex
QEMU: experimental serial flash support for 80D using SFDATA.BIN from 70D, patched at 0x10004 from 09 8B C1 20 to 00 00 01 20 meaning: size of 70D's property block at 0x10000 is 0x12BC98 (data is shifted by 4 bytes) but 80D expects a maximum size of 0x12000 in FE47BF40 ("Liar Valid Packages!!" if the size check fails) so we trim the property block at the expected size of 0x12000 this will lose a few properties, but at least the emulation goes f…
Alex
QEMU: RomRead DMA for DIGIC 6, used for initializing property blocks (very similar to regular DMA, slightly different register offsets)
Alex
QEMU: slow down UART input to work around race conditions (not exactly clean, but at least DryShell tests are now passing on all models)
Alex
QEMU: fixed UART on DIGIC 6 (DryShell works!) fixme: tests are failing, but typing on the UI works fine note: DIGIC 4/5 emulation changed a bit (0xC0270000 was misinterpreted before)
Alex
QEMU: found out why DIGIC 6 models were getting stuck at startup! The firmware was reading the memory layout from CP15 registers; most of them were emulated well in QEMU, except ATCM and BTCM, which were implemented as NOP. They are still NOP in current QEMU git. Patching the memory regions loop is no longer required! (keeping empty 80D patch for future use)
Alex
MPU spells: some names could not be identified (fixed)
Alex
QEMU tests: call mtools_setup.sh rather than duplicating its work (fixes some tests failing if mtools is configured to use lowercase by default)
Alex
run_canon_fw.sh: on Mac, bring QEMU window to foreground (by default, the window is opened behind the terminal, so one may not even notice it)
Alex
run_canon_fw.sh: print camera name in QEMU window title
Alex
run_canon_fw.sh: only clear the terminal if running in interactive mode https://serverfault.com/questions/146745/how-can-i-check-in-bash-if-a-shell-is-running-in-interactive-mode
Alex
QEMU logging: always log unmapped memory regions
Alex
GDB scripts: fix text alignment with "native" logging options (minor)
Alex
QEMU install.sh: fix null byte warning when parsing model list (bash 4.4 and newer? http://www.magiclantern.fm/forum/index.php?topic=2864.msg193118#msg193118 )
Alex
QEMU install: print fewer help details after installation; link to the online documentation
Alex
QEMU readme: formatting, typos
Alex
QEMU readme: more info regarding custom SD/CF images
Alex
QEMU readme: more ways to install ML to the virtual SD/CF images
Alex
QEMU readme: note about "make install_qemu" not available in all branches
Alex
QEMU readme: note about models using a serial flash
Alex
QEMU README: minor updates to 050a3cc
Alex
Merged unified into qemu
Alex
Merged makefile-updates into qemu
Alex
Makefile: backout 0b9b550 ?= not needed when overriding from command-line, e.g. make CONFIG_QEMU=y
Alex
Recovery tool: reworked compile-time options - show the portable hello world by default - all the interesting options are named CONFIG_BOOT_* (can be overridden from command line) - CONFIG_BOOT_DUMPER=y enables ROM dumper (default using Canon routines, two optional methods) - CONFIG_BOOT_DISP_DUMP=y enables the "matrix" dumper (requires CONFIG_BOOT_DUMPER=y) - CONFIG_BOOT_FULLFAT=y enables the low-level SD dumper (requires CONFIG_BOOT_DUMPER…
Alex
Makefile: rules for "make install_qemu" (to use them, qemu has to be installed first)
Alex
Merged makefile-updates into qemu
Alex
run_canon_fw.sh: Mac compatibility fixes
Alex
QEMU: 5D3 1.2.3 GUI works! fixme: not covered by tests
Alex
QEMU: refactored RTC CS each model now uses its own GPIO, rather than enabling all possible registers on all models 70D call trace test: minor change to 0xC02201F8, no impact on functionality
Alex
QEMU: 70D GUI works! - GDB patch required (SIO locking up DisplayMgr task, probably touch screen not responding) - RTC (similar to 6D, but on different SIO channel) - updated tests (menu, format, call trace) - minor change to 100D call trace test (0xC022005C = 450D RTC CS; no impact on functionality)
Alex
QEMU: 6D GUI works! - MPU log and serial flash from Audionut, https://bitbucket.org/hudson/magic-lantern/issues/1974/#comment-40853231 - RTC (a bit hackish, to be refactored) - GPIOs for HDMI and WriteProtect - tests (menu, format, call trace) - patched MPU spells to avoid an intermittent issue (race condition when setting picture quality?)
Alex
QEMU: fix typo in MPU spells script (broken in a42e55a) "Complete WaitID = 0x80020000" should have been commented out this disables LiveView "emulation" in 700D/650D and fixes ML menu for nightly tests todo: add a test for this (existing tests did not catch this issue)
Alex
QEMU tests: reordered (important, breaks often and/or very fast == runs earlier)
Alex
QEMU tests: run in parallel when it's straightforward to do so (experimental) not parallelized: tests requiring custom builds or checking card contents afterwards
Alex
QEMU tests: prepare for parallel execution (3) - stop each QEMU instance from the monitor socket - two methods: shutdown (clean DryOS shutdown, for GUI tests) and quit (clean QEMU shutdown without turning off the guest OS, for all other tests) - check for any stale qemu-system-arm / arm-none-eabi-gdb only after each set of tests
Alex
QEMU tests: prepare for parallel execution (2) - unique QEMU_JOB_ID for each job - unique GDB port and VNC display, derived from QEMU_JOB_ID
Alex
QEMU tests: prepare for parallel execution (1) - allow overriding GDB port for each instance (replaced '-s -S' with '-S -gdb tcp::$GDB_PORT'; gdb receives '-ex "set \$TCP_PORT=$GDB_PORT"') - allow overriding VNC display for each instance (replaced ':12345' with '$VNC_DISP') - indentation of qemu/gdb commands
Alex
QEMU scripts: rough backend support for parallel execution - requires manual resource allocation - QEMU_JOB_ID used as prefix for qemu.monitor (each instance would get its own monitor socket) - GDB port can be overriden and derived from QEMU_JOB_ID (see README) - VNC port can be handled in the same way - README updated
Alex
QEMU tests/readme: recent netcat requires -N
Alex
QEMU tests: one more race condition fix
Alex
QEMU tests: speed optimizations - only restore SD/CF images if they were actually changed - do not wait for gdb if it's not running - overhead with no tests running: from ~30 seconds to ~10 seconds
Alex
QEMU tests: more race condition fixes
Alex
QEMU tests: attempt to fix some race conditions
Alex
QEMU tests: minor fixes after refactoring
Alex
QEMU tests: use -snapshot to prevent changing SD and CF images (exceptions: tests for ROM dumper and DCIM, where we check card contents to validate the test result)
981 commits not shown.