Le 30/03/2018 à 18:54, Rob Landley a écrit : > On 03/20/2018 04:08 AM, Laurent Vivier wrote:> This series of patches is > needed > to fix a problem >> in the m68k translator that can crash QEMU when translation >> cache has too many instructions: >> >> qemu-m68k: tcg/tcg.c:883: tcg_temp_alloc: Assertion `n < 512' failed. >> qemu: uncaught target signal 11 (Segmentation fault) - core dumped >> >> I have reproduced it in linux user mode, with "ghc", and in >> system mode with the debian-installer for unstable distro >> from debian-ports. > > If someone wanted to follow along with your "boot linux on qemu-system-m68k" > work on https://github.com/vivier/qemu-m68k, which of the 51 branches should > qemu-system-m68k with like -M q800 or whatever you had working be built from?
The branch to use is q800-dev > > Also, "git pull" of the last tree I had from there exploded into a fireball of > automerge conflicts. Is there something I should know? As I rebase the branch regularly, a simple "git pull" will not work. If the branch already exist locally git checkout q800-dev git reset --hard vivier/q800-dev [I guess the remote name is "vivier"] otherwise, a simple "git checkout q800-dev" should create the branch from scrash. Thanks, Laurent
